Skip to content

Commit c9d8064

Browse files
committed
Remove limit and pagination from GetAPIInvitesMe
1 parent 434146e commit c9d8064

6 files changed

Lines changed: 108 additions & 296 deletions

File tree

api/invite_impl.go

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -132,50 +132,32 @@ func (s Server) GetAPIInvitesMe(w http.ResponseWriter, r *http.Request, params G
132132
ctx, cancel := context.WithTimeout(r.Context(), 4*database.DatabaseTimeout)
133133
defer cancel()
134134

135-
userID, ok := r.Context().Value(UserIDCtxKey{}).(uint32)
136-
if !ok {
137-
logger.Error("failed to get userid from request context")
138-
sendError(w, http.StatusUnauthorized, "Try again later.")
139-
return
140-
}
141-
142-
invitesLimit := min(params.Limit, InvitesLimitMax)
143-
144-
var lastID uint32
145-
if params.PageToken != nil {
146-
lastID = *params.PageToken
147-
} else {
148-
lastID = 0
149-
}
150-
151135
invites, err := s.DB.ListInvitesMe(ctx, database.ListInvitesMeParams{
152136
Status: params.Status,
153137
ToUserID: userID,
154-
LastID: lastID,
155-
Limit: invitesLimit,
156138
})
157139
if err != nil {
158140
logger.Error("invite api: failed to get invites", zap.Error(err))
159141
sendError(w, http.StatusInternalServerError, "user api: failed to get invites")
160142
return
161143
}
162144

163-
var nextPageToken int
164-
if len(invites) == int(invitesLimit) {
165-
nextPageToken = int(invites[len(invites)-1].InviteID)
166-
} else {
167-
nextPageToken = 0
168-
}
169-
170-
response := struct {
171-
Invites []database.ListInvitesMeRow `json:"invites"`
172-
NextPageToken int `json:"nextPageToken"`
173-
}{
174-
Invites: invites,
175-
NextPageToken: nextPageToken,
145+
parsedInvites := make([]InvitesMe, 0)
146+
for _, i := range invites {
147+
parsedInvites = append(parsedInvites, InvitesMe{
148+
CreatedAt: i.CreatedAt,
149+
ExpiryDate: openapi_types.Date{Time: i.ExpiryDate},
150+
FromUserEmail: openapi_types.Email(i.FromUserEmail),
151+
FromUserFirstName: i.FromUserFirstName,
152+
FromUserLastName: i.FromUserLastName,
153+
InviteID: i.InviteID,
154+
Message: i.Message,
155+
SlotifyGroupName: i.SlotifyGroupName,
156+
Status: InviteStatus(i.Status),
157+
})
176158
}
177159

178-
SetHeaderAndWriteResponse(w, http.StatusOK, response)
160+
SetHeaderAndWriteResponse(w, http.StatusOK, parsedInvites)
179161
}
180162

181163
// (DELETE /api/invites/{inviteID} Delete an invite).

api/server.gen.go

Lines changed: 91 additions & 116 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)