Skip to content
This repository was archived by the owner on Mar 3, 2024. It is now read-only.

Commit 2e24a50

Browse files
authored
Merge pull request #77 from Mr-Emerald-Wolf/shivam
fix:team changes
2 parents 63b527f + c095845 commit 2e24a50

File tree

1 file changed

+37
-3
lines changed

1 file changed

+37
-3
lines changed

controllers/teamController.go

+37-3
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,47 @@ func (databaseClient Database) GetTeam(ctx *fiber.Ctx) error {
109109
return ctx.Status(fiber.StatusBadRequest).JSON(fiber.Map{"status": "false", "err": "TeamId not parsable"})
110110
}
111111
teamCollection := databaseClient.MongoClient.Database("devsoc").Collection("teams")
112+
userCollection := databaseClient.MongoClient.Database("devsoc").Collection("users")
112113

113-
findTeam := models.Team{}
114+
findTeam := models.AllTeamRequest{}
114115
filter := bson.M{"_id": teamId}
115116

116-
err = teamCollection.FindOne(context.TODO(), filter).Decode(&findTeam)
117+
errr := teamCollection.FindOne(context.TODO(), filter).Decode(&findTeam)
118+
var teamMembers []models.User
117119

118-
if err != nil {
120+
for i := 0; i < findTeam.TeamSize; i++ {
121+
122+
var member models.User
123+
124+
filter := bson.M{"_id": findTeam.TeamMembers[i]}
125+
err = userCollection.FindOne(context.TODO(), filter).Decode(&member)
126+
127+
if err != nil {
128+
member = models.User{
129+
FirstName: nil,
130+
LastName: nil,
131+
Email: nil,
132+
Password: nil,
133+
PhoneNumber: nil,
134+
Token: nil,
135+
Bio: nil,
136+
Gender: nil,
137+
UserRole: "HACKER",
138+
// Set other fields to their default or blank values
139+
IsActive: false,
140+
IsVerify: false,
141+
IsCanShare: false,
142+
IsCheckedIn: false,
143+
InTeam: false,
144+
IsBoard: false,
145+
}
146+
}
147+
148+
teamMembers = append(teamMembers, member)
149+
}
150+
findTeam.TeamMemberDetails = teamMembers
151+
152+
if errr != nil {
119153
return ctx.Status(fiber.StatusBadRequest).JSON(fiber.Map{"status": "false", "err": err.Error()})
120154
}
121155

0 commit comments

Comments
 (0)