Skip to content

Commit

Permalink
fix: put issuers in seperate list (#571)
Browse files Browse the repository at this point in the history
  • Loading branch information
IanKrieger authored Aug 21, 2023
1 parent aefdb16 commit 91c3d76
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions server/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,8 @@ func (c *Server) FetchAllIssuers() ([]model.Issuer, error) {
return nil, utils.ProcessingErrorFromError(err, !isPostgresNotFoundError(err))
}

for _, fetchedIssuer := range fetchedIssuers {
results := make([]model.Issuer, len(fetchedIssuers))
for idx, currIssuer := range fetchedIssuers {
var keys []model.IssuerKeys
sErr := c.db.Select(
&keys,
Expand All @@ -319,7 +320,7 @@ func (c *Server) FetchAllIssuers() ([]model.Issuer, error) {
AND (end_at > now() OR end_at IS NULL)
AND (start_at <= now() OR start_at IS NULL)
ORDER BY end_at ASC NULLS LAST, start_at ASC, created_at ASC`,
fetchedIssuer.ID,
currIssuer.ID,
)

if sErr != nil {
Expand All @@ -330,14 +331,15 @@ func (c *Server) FetchAllIssuers() ([]model.Issuer, error) {
return nil, utils.ProcessingErrorFromError(sErr, isNotPostgresNotFoundError)
}

fetchedIssuer.Keys = append(fetchedIssuer.Keys, keys...)
currIssuer.Keys = append(currIssuer.Keys, keys...)
results[idx] = currIssuer
}

if c.caches != nil {
c.caches["issuers"].SetDefault("all", fetchedIssuers)
c.caches["issuers"].SetDefault("all", results)
}

return fetchedIssuers, nil
return results, nil
}

func (c *Server) fetchIssuerKeys(fetchedIssuers []model.Issuer) ([]model.Issuer, error) {
Expand Down

0 comments on commit 91c3d76

Please sign in to comment.