diff --git a/cmd/server/pactasrv/conv/helpers.go b/cmd/server/pactasrv/conv/helpers.go index d967dfd..3c5d086 100644 --- a/cmd/server/pactasrv/conv/helpers.go +++ b/cmd/server/pactasrv/conv/helpers.go @@ -6,6 +6,10 @@ func ptr[T any](t T) *T { return &t } +func strPtr[T ~string](t T) *string { + return ptr(string(t)) +} + func ifNil[T any](t *T, fallback T) T { if t == nil { return fallback diff --git a/cmd/server/pactasrv/conv/pacta_to_oapi.go b/cmd/server/pactasrv/conv/pacta_to_oapi.go index e846dab..afb4eec 100644 --- a/cmd/server/pactasrv/conv/pacta_to_oapi.go +++ b/cmd/server/pactasrv/conv/pacta_to_oapi.go @@ -24,7 +24,7 @@ func InitiativeToOAPI(i *pacta.Initiative) (*api.Initiative, error) { IsAcceptingNewPortfolios: i.IsAcceptingNewPortfolios, Language: api.InitiativeLanguage(i.Language), Name: i.Name, - PactaVersion: ptr(string(i.PACTAVersion.ID)), + PactaVersion: strPtr(i.PACTAVersion.ID), PublicDescription: i.PublicDescription, RequiresInvitationToJoin: i.RequiresInvitationToJoin, PortfolioInitiativeMemberships: pims, @@ -37,7 +37,7 @@ func portfolioInitiativeMembershipToOAPIPortfolio(in *pacta.PortfolioInitiativeM CreatedAt: in.CreatedAt, } if in.AddedBy != nil && in.AddedBy.ID == "" { - out.AddedByUserId = ptr(string(in.AddedBy.ID)) + out.AddedByUserId = strPtr(in.AddedBy.ID) } p, err := PortfolioToOAPI(in.Portfolio) if err != nil { @@ -53,7 +53,7 @@ func portfolioInitiativeMembershipToOAPIInitiative(in *pacta.PortfolioInitiative CreatedAt: in.CreatedAt, } if in.AddedBy != nil && in.AddedBy.ID == "" { - out.AddedByUserId = ptr(string(in.AddedBy.ID)) + out.AddedByUserId = strPtr(in.AddedBy.ID) } if in.Initiative != nil { i, err := InitiativeToOAPI(in.Initiative) @@ -104,7 +104,7 @@ func InitiativeInvitationToOAPI(i *pacta.InitiativeInvitation) (*api.InitiativeI } var usedBy *string if i.UsedBy != nil { - usedBy = ptr(string(i.UsedBy.ID)) + usedBy = strPtr(i.UsedBy.ID) } return &api.InitiativeInvitation{ CreatedAt: i.CreatedAt,