👻 Use JSON serializer everywhere #680
Conversation
| @@ -77,7 +78,7 @@ loop: | |||
| } | |||
|
|
|||
| func (r *MembershipResolver) cacheArchetypes() (err error) { | |||
| if len(r.archetypes) > 0 { | |||
| if r.archetypesCached { | |||
There was a problem hiding this comment.
Prevents repeatedly querying if the hub doesn't have any archetypes.
| questionnaire.Thresholds, _ = json.Marshal(q.Thresholds) | ||
| questionnaire.RiskMessages = model.RiskMessages(q.RiskMessages) | ||
| questionnaire.Thresholds = model.Thresholds(q.Thresholds) | ||
| bytes, jErr := json.Marshal(q.Sections) |
There was a problem hiding this comment.
Simpler to marshal and unmarshal the sections from the seed than to convert all of the nested structs.
| @@ -17,28 +17,28 @@ var ( | |||
| Questionnaire: api.Ref{ | |||
| Name: questionnaire.Questionnaire1.Name, | |||
| }, | |||
| Sections: []assessment.Section{ | |||
| Sections: []api.Section{ | |||
There was a problem hiding this comment.
Package discrepancies for nested structs are because api.Section is defined as model.Section, so all the nested structs are from the model package.
| { | ||
| Order: uint2ptr(1), |
There was a problem hiding this comment.
We made the Order required in the API, so no reason for it to continue to be a pointer.
| } | ||
| if m.Links != nil { | ||
| _ = json.Unmarshal(m.Links, &r.Links) | ||
| r.Labels = m.Labels |
There was a problem hiding this comment.
r.Links = []Link{} so it's not nil?
There was a problem hiding this comment.
The Links field is omitempty so seemed like it was okay to let it be nil. No problem changing it if you disagree.
| @@ -2080,7 +2072,7 @@ func (h *AnalysisHandler) archive(ctx *gin.Context, q *gorm.DB) (err error) { | |||
| db = db.Where("n.IssueID = i.ID") | |||
| db = db.Where("i.AnalysisID", m.ID) | |||
| db = db.Group("i.ID") | |||
| summary := []ArchivedIssue{} | |||
| summary := []model.ArchivedIssue{} | |||
There was a problem hiding this comment.
type ArchivedIssue = model.ArchivedIssue
Shouldn't this be a []ArchivedIssue?
There was a problem hiding this comment.
Seemed more appropriate to use the one from the model package because it's used directly in a query and stored on the model.
| @@ -44,3 +44,55 @@ type Review struct { | |||
| ArchetypeID *uint `gorm:"uniqueIndex"` | |||
| Archetype *Archetype | |||
| } | |||
|
|
|||
Signed-off-by: Sam Lucidi <slucidi@redhat.com>
Extends the use of the JSON serializer to the rest of the models. Signed-off-by: Sam Lucidi <slucidi@redhat.com>
Extends the use of the JSON serializer to the rest of the models.