fix: return correct dependencies on REST endpoint

satisfactorymodding · Aug 19, 2024 · b6d6d3c · b6d6d3c
1 parent bd02e8f
commit b6d6d3c
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/nodes/mod.go b/nodes/mod.go
@@ -12,6 +12,7 @@ import (
 	"github.com/satisfactorymodding/smr-api/db"
 	"github.com/satisfactorymodding/smr-api/generated"
 	"github.com/satisfactorymodding/smr-api/generated/conv"
+	"github.com/satisfactorymodding/smr-api/generated/ent"
 	mod2 "github.com/satisfactorymodding/smr-api/generated/ent/mod"
 	version2 "github.com/satisfactorymodding/smr-api/generated/ent/version"
 	"github.com/satisfactorymodding/smr-api/generated/ent/versiontarget"
@@ -252,7 +253,7 @@ func getModVersions(c echo.Context) (interface{}, *ErrorResponse) {
 
 	modID := c.Param("modId")
 
-	mod, err := db.From(c.Request().Context()).Mod.Query().
+	mod, err := db.From(c.Request().Context()).Debug().Mod.Query().
 		WithTags().
 		Where(mod2.ID(modID)).
 		First(c.Request().Context())
@@ -266,7 +267,9 @@ func getModVersions(c echo.Context) (interface{}, *ErrorResponse) {
 	}
 
 	versions, err := mod.QueryVersions().
-		WithDependencies().
+		WithVersionDependencies(func(query *ent.VersionDependencyQuery) {
+			query.WithMod()
+		}).
 		WithTargets().
 		Limit(limit).
 		Offset(offset).
@@ -278,7 +281,13 @@ func getModVersions(c echo.Context) (interface{}, *ErrorResponse) {
 		return nil, &ErrorVersionNotFound
 	}
 
-	return (*conv.VersionImpl)(nil).ConvertSlice(versions), nil
+	for _, version := range versions {
+		for _, dependency := range version.Edges.VersionDependencies {
+			dependency.ModID = dependency.Edges.Mod.ModReference
+		}
+	}
+
+	return (*conv.ModAllVersionsImpl)(nil).ConvertSlice(versions), nil
 }
 
 // @Summary Retrieve a Mod Authors
@@ -478,7 +487,9 @@ func getAllModVersions(c echo.Context) (interface{}, *ErrorResponse) {
 	}
 
 	versions, err := mod.QueryVersions().
-		WithVersionDependencies().
+		WithVersionDependencies(func(query *ent.VersionDependencyQuery) {
+			query.WithMod()
+		}).
 		WithTargets().
 		Where(version2.Approved(true), version2.Denied(false)).
 		Select(version2.FieldHash, version2.FieldSize, version2.FieldGameVersion, version2.FieldVersion).
@@ -488,5 +499,11 @@ func getAllModVersions(c echo.Context) (interface{}, *ErrorResponse) {
 		return nil, &ErrorVersionNotFound
 	}
 
+	for _, version := range versions {
+		for _, dependency := range version.Edges.VersionDependencies {
+			dependency.ModID = dependency.Edges.Mod.ModReference
+		}
+	}
+
 	return (*conv.ModAllVersionsImpl)(nil).ConvertSlice(versions), nil
 }