Skip to content

Commit 12dc623

Browse files
committed
progress: got modpacktargets to generate
1 parent 163b390 commit 12dc623

File tree

11 files changed

+232
-51
lines changed

11 files changed

+232
-51
lines changed

conversion/ent_to_graphql.go

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ type VirustotalResult interface {
140140
// goverter:converter
141141
// goverter:output:file ../generated/conv/modpack.go
142142
// goverter:output:package conv
143-
// goverter:extend TimeToString UIntToInt Int64ToInt EntModpackTargetToString
143+
// goverter:extend TimeToString UIntToInt Int64ToInt EntModpackReleaseToGenerated
144144
type Modpack interface {
145145
// goverter:map Edges.Tags Tags
146146
// goverter:map Edges.ModpackMods Mods
@@ -152,19 +152,49 @@ type Modpack interface {
152152
ConvertSlice(source []*ent.Modpack) []*generated.Modpack
153153
}
154154

155-
func EntModpackTargetToString(t *ent.ModpackTarget) string {
156-
return t.TargetName
155+
func EntModpackReleaseToGenerated(source *ent.ModpackRelease) *generated.ModpackRelease {
156+
if source == nil {
157+
return nil
158+
}
159+
targets := make([]*generated.ModpackTarget, len(source.Edges.Targets))
160+
for i, t := range source.Edges.Targets {
161+
targets[i] = &generated.ModpackTarget{
162+
ID: t.ID,
163+
ReleaseID: t.ModpackID,
164+
TargetName: t.TargetName,
165+
}
166+
}
167+
return &generated.ModpackRelease{
168+
ID: source.ID,
169+
Version: source.Version,
170+
CreatedAt: source.CreatedAt.Format(time.RFC3339),
171+
Lockfile: source.Lockfile,
172+
Changelog: source.Changelog,
173+
Targets: targets,
174+
}
157175
}
158176

159177
// goverter:converter
160178
// goverter:output:file ../generated/conv/modpack_release.go
161179
// goverter:output:package conv
162-
// goverter:extend TimeToString
180+
// goverter:extend TimeToString EntModpackTargetToGenerated
163181
type ModpackRelease interface {
182+
// goverter:map Edges.Targets Targets
164183
Convert(source *ent.ModpackRelease) *generated.ModpackRelease
165184
ConvertSlice(source []*ent.ModpackRelease) []*generated.ModpackRelease
166185
}
167186

187+
func EntModpackTargetToGenerated(source *ent.ModpackTarget) *generated.ModpackTarget {
188+
if source == nil {
189+
return nil
190+
}
191+
return &generated.ModpackTarget{
192+
ID: source.ID,
193+
ReleaseID: source.ModpackID,
194+
TargetName: source.TargetName,
195+
}
196+
}
197+
168198
func TimeToString(i time.Time) string {
169199
return i.Format(time.RFC3339)
170200
}

generated/conv/modpack.go

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generated/conv/modpack_release.go

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

generated/docs/docs.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,11 +1316,31 @@ const docTemplate = `{
13161316
"lockfile": {
13171317
"type": "string"
13181318
},
1319+
"targets": {
1320+
"type": "array",
1321+
"items": {
1322+
"$ref": "#/definitions/generated.ModpackTarget"
1323+
}
1324+
},
13191325
"version": {
13201326
"type": "string"
13211327
}
13221328
}
13231329
},
1330+
"generated.ModpackTarget": {
1331+
"type": "object",
1332+
"properties": {
1333+
"id": {
1334+
"type": "string"
1335+
},
1336+
"release_id": {
1337+
"type": "string"
1338+
},
1339+
"target_name": {
1340+
"type": "string"
1341+
}
1342+
}
1343+
},
13241344
"generated.Tag": {
13251345
"type": "object",
13261346
"properties": {

generated/docs/swagger.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,11 +1310,31 @@
13101310
"lockfile": {
13111311
"type": "string"
13121312
},
1313+
"targets": {
1314+
"type": "array",
1315+
"items": {
1316+
"$ref": "#/definitions/generated.ModpackTarget"
1317+
}
1318+
},
13131319
"version": {
13141320
"type": "string"
13151321
}
13161322
}
13171323
},
1324+
"generated.ModpackTarget": {
1325+
"type": "object",
1326+
"properties": {
1327+
"id": {
1328+
"type": "string"
1329+
},
1330+
"release_id": {
1331+
"type": "string"
1332+
},
1333+
"target_name": {
1334+
"type": "string"
1335+
}
1336+
}
1337+
},
13181338
"generated.Tag": {
13191339
"type": "object",
13201340
"properties": {

generated/docs/swagger.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,22 @@ definitions:
202202
type: string
203203
lockfile:
204204
type: string
205+
targets:
206+
items:
207+
$ref: '#/definitions/generated.ModpackTarget'
208+
type: array
205209
version:
206210
type: string
207211
type: object
212+
generated.ModpackTarget:
213+
properties:
214+
id:
215+
type: string
216+
release_id:
217+
type: string
218+
target_name:
219+
type: string
220+
type: object
208221
generated.Tag:
209222
properties:
210223
description:

0 commit comments

Comments
 (0)