Merge branch 'staging'

Author: Vilsol

gql/gql_types.go

@@ -7,15 +7,15 @@ import (
 	"github.com/satisfactorymodding/smr-api/generated"
 )
 
-func DBUserToGenerated(user *postgres.User) *generated.User {
+func DBUserToGenerated(user *postgres.User) generated.User {
 	if user == nil {
-		return nil
+		return generated.User{}
 	}
 
 	Email := (*user).Email
 	Avatar := (*user).Avatar
 
-	result := &generated.User{
+	result := generated.User{
 		ID:         (*user).ID,
 		Username:   (*user).Username,
 		Email:      &Email,
@@ -29,9 +29,9 @@ func DBUserToGenerated(user *postgres.User) *generated.User {
 	return result
 }
 
-func DBModToGenerated(mod *postgres.Mod) *generated.Mod {
+func DBModToGenerated(mod *postgres.Mod) generated.Mod {
 	if mod == nil {
-		return nil
+		return generated.Mod{}
 	}
 
 	Logo := (*mod).Logo
@@ -43,7 +43,7 @@ func DBModToGenerated(mod *postgres.Mod) *generated.Mod {
 		LastVersionDate = (*mod).LastVersionDate.Format(time.RFC3339Nano)
 	}
 
-	return &generated.Mod{
+	return generated.Mod{
 		ID:               mod.ID,
 		Name:             mod.Name,
 		ShortDescription: mod.ShortDescription,
@@ -66,9 +66,9 @@ func DBModToGenerated(mod *postgres.Mod) *generated.Mod {
 	}
 }
 
-func DBVersionToGenerated(version *postgres.Version) *generated.Version {
+func DBVersionToGenerated(version *postgres.Version) generated.Version {
 	if version == nil {
-		return nil
+		return generated.Version{}
 	}
 
 	size := 0
@@ -77,7 +77,7 @@ func DBVersionToGenerated(version *postgres.Version) *generated.Version {
 		size = int(*version.Size)
 	}
 
-	return &generated.Version{
+	return generated.Version{
 		ID:         version.ID,
 		Version:    version.Version,
 		SmlVersion: version.SMLVersion,
@@ -94,12 +94,12 @@ func DBVersionToGenerated(version *postgres.Version) *generated.Version {
 	}
 }
 
-func DBGuideToGenerated(guide *postgres.Guide) *generated.Guide {
+func DBGuideToGenerated(guide *postgres.Guide) generated.Guide {
 	if guide == nil {
-		return nil
+		return generated.Guide{}
 	}
 
-	return &generated.Guide{
+	return generated.Guide{
 		ID:               guide.ID,
 		Name:             guide.Name,
 		ShortDescription: guide.ShortDescription,
@@ -112,12 +112,12 @@ func DBGuideToGenerated(guide *postgres.Guide) *generated.Guide {
 	}
 }
 
-func DBSMLVersionToGenerated(smlVersion *postgres.SMLVersion) *generated.SMLVersion {
+func DBSMLVersionToGenerated(smlVersion *postgres.SMLVersion) generated.SMLVersion {
 	if smlVersion == nil {
-		return nil
+		return generated.SMLVersion{}
 	}
 
-	return &generated.SMLVersion{
+	return generated.SMLVersion{
 		ID:                  smlVersion.ID,
 		Version:             smlVersion.Version,
 		SatisfactoryVersion: smlVersion.SatisfactoryVersion,
@@ -131,12 +131,12 @@ func DBSMLVersionToGenerated(smlVersion *postgres.SMLVersion) *generated.SMLVers
 	}
 }
 
-func DBBootstrapVersionToGenerated(bootstrapVersion *postgres.BootstrapVersion) *generated.BootstrapVersion {
+func DBBootstrapVersionToGenerated(bootstrapVersion *postgres.BootstrapVersion) generated.BootstrapVersion {
 	if bootstrapVersion == nil {
-		return nil
+		return generated.BootstrapVersion{}
 	}
 
-	return &generated.BootstrapVersion{
+	return generated.BootstrapVersion{
 		ID:                  bootstrapVersion.ID,
 		Version:             bootstrapVersion.Version,
 		SatisfactoryVersion: bootstrapVersion.SatisfactoryVersion,
@@ -149,51 +149,51 @@ func DBBootstrapVersionToGenerated(bootstrapVersion *postgres.BootstrapVersion)
 	}
 }
 
-func DBVersionDependencyToGenerated(versionDependency *postgres.VersionDependency) *generated.VersionDependency {
+func DBVersionDependencyToGenerated(versionDependency *postgres.VersionDependency) generated.VersionDependency {
 	if versionDependency == nil {
-		return nil
+		return generated.VersionDependency{}
 	}
 
-	return &generated.VersionDependency{
+	return generated.VersionDependency{
 		VersionID: versionDependency.VersionID,
 		ModID:     versionDependency.ModID,
 		Condition: versionDependency.Condition,
 		Optional:  versionDependency.Optional,
 	}
 }
 
-func DBAnnouncementToGenerated(announcement *postgres.Announcement) *generated.Announcement {
+func DBAnnouncementToGenerated(announcement *postgres.Announcement) generated.Announcement {
 	if announcement == nil {
-		return nil
+		return generated.Announcement{}
 	}
 
-	return &generated.Announcement{
+	return generated.Announcement{
 		ID:         announcement.ID,
 		Message:    announcement.Message,
 		Importance: generated.AnnouncementImportance(announcement.Importance),
 	}
 }
 
-func DBAnnouncementsToGeneratedSlice(announcements []postgres.Announcement) []*generated.Announcement {
-	converted := make([]*generated.Announcement, len(announcements))
+func DBAnnouncementsToGeneratedSlice(announcements []postgres.Announcement) []generated.Announcement {
+	converted := make([]generated.Announcement, len(announcements))
 	for i, announcement := range announcements {
 		converted[i] = DBAnnouncementToGenerated(&announcement)
 	}
 	return converted
 }
 
-func DBTagToGenerated(tag *postgres.Tag) *generated.Tag {
+func DBTagToGenerated(tag *postgres.Tag) generated.Tag {
 	if tag == nil {
-		return nil
+		return generated.Tag{}
 	}
-	return &generated.Tag{
+	return generated.Tag{
 		Name: tag.Name,
 		ID:   tag.ID,
 	}
 }
 
-func DBTagsToGeneratedSlice(tags []postgres.Tag) []*generated.Tag {
-	converted := make([]*generated.Tag, len(tags))
+func DBTagsToGeneratedSlice(tags []postgres.Tag) []generated.Tag {
+	converted := make([]generated.Tag, len(tags))
 	for i, tag := range tags {
 		converted[i] = DBTagToGenerated(&tag)
 	}
@@ -210,7 +210,7 @@ func GenCompInfoToDBCompInfo(gen *generated.CompatibilityInfoInput) *postgres.Co
 	}
 }
 
-func GenCompToDBComp(gen *generated.CompatibilityInput) postgres.Compatibility {
+func GenCompToDBComp(gen generated.CompatibilityInput) postgres.Compatibility {
 	r := postgres.Compatibility{
 		State: string(gen.State),
 	}
@@ -228,8 +228,8 @@ func DBCompInfoToGenCompInfo(gen *postgres.CompatibilityInfo) *generated.Compati
 	}
 }
 
-func DBCompToGenComp(db postgres.Compatibility) *generated.Compatibility {
-	return &generated.Compatibility{
+func DBCompToGenComp(db postgres.Compatibility) generated.Compatibility {
+	return generated.Compatibility{
 		State: generated.CompatibilityState(db.State),
 		Note:  &db.Note,
 	}

gql/resolver_announcements.go

@@ -4,9 +4,10 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
-	"github.com/satisfactorymodding/smr-api/util"
 	"gopkg.in/go-playground/validator.v9"
 
+	"github.com/satisfactorymodding/smr-api/util"
+
 	"github.com/satisfactorymodding/smr-api/db/postgres"
 	"github.com/satisfactorymodding/smr-api/generated"
 )
@@ -29,7 +30,8 @@ func (r *mutationResolver) CreateAnnouncement(ctx context.Context, announcement
 	if err != nil {
 		return nil, err
 	}
-	return DBAnnouncementToGenerated(resultAnnouncement), nil
+	temp := DBAnnouncementToGenerated(resultAnnouncement)
+	return &temp, nil
 }
 
 func (r *mutationResolver) DeleteAnnouncement(ctx context.Context, announcementID string) (bool, error) {
@@ -67,7 +69,8 @@ func (r *mutationResolver) UpdateAnnouncement(ctx context.Context, announcementI
 
 	postgres.Save(newCtx, &dbAnnouncement)
 
-	return DBAnnouncementToGenerated(dbAnnouncement), nil
+	temp := DBAnnouncementToGenerated(dbAnnouncement)
+	return &temp, nil
 }
 
 func (r *queryResolver) GetAnnouncement(ctx context.Context, announcementID string) (*generated.Announcement, error) {
@@ -76,10 +79,11 @@ func (r *queryResolver) GetAnnouncement(ctx context.Context, announcementID stri
 
 	announcement := postgres.GetAnnouncementByID(newCtx, announcementID)
 
-	return DBAnnouncementToGenerated(announcement), nil
+	temp := DBAnnouncementToGenerated(announcement)
+	return &temp, nil
 }
 
-func (r *queryResolver) GetAnnouncements(ctx context.Context) ([]*generated.Announcement, error) {
+func (r *queryResolver) GetAnnouncements(ctx context.Context) ([]generated.Announcement, error) {
 	wrapper, newCtx := WrapQueryTrace(ctx, "getAnnouncements")
 	defer wrapper.end()
 
@@ -88,7 +92,7 @@ func (r *queryResolver) GetAnnouncements(ctx context.Context) ([]*generated.Anno
 	return DBAnnouncementsToGeneratedSlice(announcements), nil
 }
 
-func (r *queryResolver) GetAnnouncementsByImportance(ctx context.Context, importance generated.AnnouncementImportance) ([]*generated.Announcement, error) {
+func (r *queryResolver) GetAnnouncementsByImportance(ctx context.Context, importance generated.AnnouncementImportance) ([]generated.Announcement, error) {
 	wrapper, newCtx := WrapQueryTrace(ctx, "getAnnouncementsByImportance")
 	defer wrapper.end()
 

gql/resolver_bootstrap_versions.go

@@ -45,7 +45,8 @@ func (r *mutationResolver) CreateBootstrapVersion(ctx context.Context, bootstrap
 		return nil, errors.Wrap(err, "failed to create bootstrap version")
 	}
 
-	return DBBootstrapVersionToGenerated(resultBootstrapVersion), nil
+	temp := DBBootstrapVersionToGenerated(resultBootstrapVersion)
+	return &temp, nil
 }
 
 func (r *mutationResolver) UpdateBootstrapVersion(ctx context.Context, bootstrapVersionID string, bootstrapVersion generated.UpdateBootstrapVersion) (*generated.BootstrapVersion, error) {
@@ -72,7 +73,8 @@ func (r *mutationResolver) UpdateBootstrapVersion(ctx context.Context, bootstrap
 
 	postgres.Save(newCtx, &dbBootstrapVersion)
 
-	return DBBootstrapVersionToGenerated(dbBootstrapVersion), nil
+	temp := DBBootstrapVersionToGenerated(dbBootstrapVersion)
+	return &temp, nil
 }
 
 func (r *mutationResolver) DeleteBootstrapVersion(ctx context.Context, bootstrapVersionID string) (bool, error) {
@@ -94,18 +96,19 @@ func (r *queryResolver) GetBootstrapVersion(ctx context.Context, bootstrapVersio
 	wrapper, newCtx := WrapQueryTrace(ctx, "getBootstrapVersion")
 	defer wrapper.end()
 
-	return DBBootstrapVersionToGenerated(postgres.GetBootstrapVersionByID(newCtx, bootstrapVersionID)), nil
+	temp := DBBootstrapVersionToGenerated(postgres.GetBootstrapVersionByID(newCtx, bootstrapVersionID))
+	return &temp, nil
 }
 
-func (r *queryResolver) GetBootstrapVersions(ctx context.Context, filter map[string]interface{}) (*generated.GetBootstrapVersions, error) {
+func (r *queryResolver) GetBootstrapVersions(ctx context.Context, filter map[string]interface{}) (generated.GetBootstrapVersions, error) {
 	wrapper, _ := WrapQueryTrace(ctx, "getBootstrapVersions")
 	defer wrapper.end()
-	return &generated.GetBootstrapVersions{}, nil
+	return generated.GetBootstrapVersions{}, nil
 }
 
 type getBootstrapVersionsResolver struct{ *Resolver }
 
-func (r *getBootstrapVersionsResolver) BootstrapVersions(ctx context.Context, obj *generated.GetBootstrapVersions) ([]*generated.BootstrapVersion, error) {
+func (r *getBootstrapVersionsResolver) BootstrapVersions(ctx context.Context, obj *generated.GetBootstrapVersions) ([]generated.BootstrapVersion, error) {
 	wrapper, newCtx := WrapQueryTrace(ctx, "GetBootstrapVersions.bootstrapVersions")
 	defer wrapper.end()
 
@@ -128,7 +131,7 @@ func (r *getBootstrapVersionsResolver) BootstrapVersions(ctx context.Context, ob
 		return nil, errors.New("bootstrap releases not found")
 	}
 
-	converted := make([]*generated.BootstrapVersion, len(bootstrapVersions))
+	converted := make([]generated.BootstrapVersion, len(bootstrapVersions))
 	for k, v := range bootstrapVersions {
 		converted[k] = DBBootstrapVersionToGenerated(&v)
 	}

gql/resolver_guides.go

@@ -48,7 +48,8 @@ func (r *mutationResolver) CreateGuide(ctx context.Context, guide generated.NewG
 	}
 
 	// Need to get the guide again to populate tags
-	return DBGuideToGenerated(postgres.GetGuideByIDNoCache(newCtx, resultGuide.ID)), nil
+	temp := DBGuideToGenerated(postgres.GetGuideByIDNoCache(newCtx, resultGuide.ID))
+	return &temp, nil
 }
 
 func (r *mutationResolver) UpdateGuide(ctx context.Context, guideID string, guide generated.UpdateGuide) (*generated.Guide, error) {
@@ -77,7 +78,8 @@ func (r *mutationResolver) UpdateGuide(ctx context.Context, guideID string, guid
 
 	postgres.Save(newCtx, &dbGuide)
 
-	return DBGuideToGenerated(dbGuide), nil
+	temp := DBGuideToGenerated(dbGuide)
+	return &temp, nil
 }
 
 func (r *mutationResolver) DeleteGuide(ctx context.Context, guideID string) (bool, error) {
@@ -107,18 +109,19 @@ func (r *queryResolver) GetGuide(ctx context.Context, guideID string) (*generate
 		}
 	}
 
-	return DBGuideToGenerated(guide), nil
+	temp := DBGuideToGenerated(guide)
+	return &temp, nil
 }
 
-func (r *queryResolver) GetGuides(ctx context.Context, filter map[string]interface{}) (*generated.GetGuides, error) {
+func (r *queryResolver) GetGuides(ctx context.Context, filter map[string]interface{}) (generated.GetGuides, error) {
 	wrapper, _ := WrapQueryTrace(ctx, "getGuides")
 	defer wrapper.end()
-	return &generated.GetGuides{}, nil
+	return generated.GetGuides{}, nil
 }
 
 type getGuidesResolver struct{ *Resolver }
 
-func (r *getGuidesResolver) Guides(ctx context.Context, obj *generated.GetGuides) ([]*generated.Guide, error) {
+func (r *getGuidesResolver) Guides(ctx context.Context, obj *generated.GetGuides) ([]generated.Guide, error) {
 	wrapper, newCtx := WrapQueryTrace(ctx, "GetGuides.guides")
 	defer wrapper.end()
 
@@ -141,7 +144,7 @@ func (r *getGuidesResolver) Guides(ctx context.Context, obj *generated.GetGuides
 		return nil, errors.New("guides not found")
 	}
 
-	converted := make([]*generated.Guide, len(guides))
+	converted := make([]generated.Guide, len(guides))
 	for k, v := range guides {
 		converted[k] = DBGuideToGenerated(&v)
 	}
@@ -179,5 +182,6 @@ func (r *guideResolver) User(ctx context.Context, obj *generated.Guide) (*genera
 		return nil, errors.New("user not found")
 	}
 
-	return DBUserToGenerated(user), nil
+	temp := DBUserToGenerated(user)
+	return &temp, nil
 }