Skip to content

Commit c19759b

Browse files
committed
feat: Modified return value of GetModCompatibilities
1 parent c3ac469 commit c19759b

5 files changed

Lines changed: 74 additions & 11 deletions

File tree

generated/generated.go

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

generated/models_gen.go

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

gql/resolver_modpacks.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,10 @@ func (r *queryResolver) GetModCompatibilities(ctx context.Context, modpackID str
325325
// build list of mods that are causing the pack to have that compatibility state
326326
eaWorstList := []*generated.Mod{}
327327
expWorstList := []*generated.Mod{}
328+
compatibilityState := generated.CompatibilityInfo{
329+
Ea: &generated.Compatibility{State: packWorstEaState, Note: nil},
330+
Exp: &generated.Compatibility{State: packWorstExpState, Note: nil},
331+
}
328332
packIsNotBothWorks := packWorstEaState != generated.CompatibilityStateWorks || packWorstExpState != generated.CompatibilityStateWorks
329333
if packIsNotBothWorks {
330334
for _, mod := range mods {
@@ -339,11 +343,8 @@ func (r *queryResolver) GetModCompatibilities(ctx context.Context, modpackID str
339343
}
340344
}
341345
}
342-
return &generated.ModCompatibilities{WorstEa: eaWorstList, WorstExp: expWorstList}, nil
343-
344-
} else {
345-
return &generated.ModCompatibilities{WorstEa: generated.CompatibilityStateWorks, WorstExp: generated.CompatibilityStateWorks}, nil
346346
}
347+
return &generated.ModCompatibilities{Compatibility: &compatibilityState, WorstEa: eaWorstList, WorstExp: expWorstList}, nil
347348
}
348349

349350
func (r *mutationResolver) CreateModpackRelease(ctx context.Context, modpackID string, release generated.NewModpackRelease) (*generated.ModpackRelease, error) {

schemas/modpack.graphql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ type GetModpacks {
6060
}
6161

6262
type ModCompatibilities{
63+
compatibility: CompatibilityInfo
6364
worstEA: [Mod!]!
6465
worstEXP: [Mod!]!
6566
}

tests/modpack_compatibility_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ func TestModpackCompatibility(t *testing.T) {
158158

159159
testza.AssertEqual(t, 1, len(queryResponse.GetModCompatibilities.WorstEa))
160160
testza.AssertEqual(t, mods[0], queryResponse.GetModCompatibilities.WorstEa[0].ID)
161-
testza.AssertEqual(t, generated.CompatibilityStateBroken, queryResponse.GetModCompatibilities.WorstEa[0].Compatibility.Ea.State)
161+
testza.AssertEqual(t, generated.CompatibilityStateBroken, queryResponse.GetModCompatibilities.Compatibility.Ea.State)
162162

163163
testza.AssertEqual(t, 1, len(queryResponse.GetModCompatibilities.WorstExp))
164164
testza.AssertEqual(t, mods[1], queryResponse.GetModCompatibilities.WorstExp[0].ID)
165-
testza.AssertEqual(t, generated.CompatibilityStateDamaged, queryResponse.GetModCompatibilities.WorstExp[0].Compatibility.Exp.State)
165+
testza.AssertEqual(t, generated.CompatibilityStateDamaged, queryResponse.GetModCompatibilities.Compatibility.Exp.State)
166166
})
167167

168168
t.Run("Multi mod compatibility", func(t *testing.T) {
@@ -249,7 +249,7 @@ func TestModpackCompatibility(t *testing.T) {
249249
testza.AssertNoError(t, err)
250250

251251
testza.AssertEqual(t, 2, len(queryResponse.GetModCompatibilities.WorstEa))
252-
testza.AssertEqual(t, generated.CompatibilityStateBroken, queryResponse.GetModCompatibilities.WorstEa[0].Compatibility.Ea.State)
252+
testza.AssertEqual(t, generated.CompatibilityStateBroken, queryResponse.GetModCompatibilities.Compatibility.Ea.State)
253253
testza.AssertEqual(t, 0, len(queryResponse.GetModCompatibilities.WorstExp))
254254
})
255255
}

0 commit comments

Comments
 (0)