fix: ensure systemconfigschema is included in installation output

gettakaro · Dec 29, 2024 · c9de8f5 · c9de8f5
1 parent b03529d
commit c9de8f5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/packages/app-api/src/controllers/__tests__/ModuleController.integration.test.ts b/packages/app-api/src/controllers/__tests__/ModuleController.integration.test.ts
@@ -42,6 +42,7 @@ const tests = [
     snapshot: true,
     name: 'Update',
     setup,
+    filteredFields: ['moduleId'],
     test: async function () {
       return this.client.module.moduleControllerUpdate(this.setupData.id, {
         name: 'Updated module',

diff --git a/packages/app-api/src/db/module.ts b/packages/app-api/src/db/module.ts
@@ -220,12 +220,16 @@ export class ModuleRepo extends ITakaroRepo<ModuleModel, ModuleOutputDTO, Module
 
     const result = await new QueryBuilder<ModuleInstallationModel, ModuleInstallationOutputDTO>({
       ...filters,
-      extend: ['version', 'module'],
-    }).build(queryInstallations);
+    }).build(queryInstallations.modify('standardExtend'));
 
     return {
       total: result.total,
-      results: result.results.map((_) => new ModuleInstallationOutputDTO(_ as unknown as ModuleInstallationOutputDTO)),
+      results: result.results
+        .map((_) => new ModuleInstallationOutputDTO(_ as unknown as ModuleInstallationOutputDTO))
+        .map((_) => {
+          _.version.systemConfigSchema = getSystemConfigSchema(_.version as unknown as ModuleVersionOutputDTO);
+          return _;
+        }),
     };
   }
 
@@ -434,6 +438,9 @@ export class ModuleRepo extends ITakaroRepo<ModuleModel, ModuleOutputDTO, Module
     returnVal.version.permissions = returnVal.version.permissions.sort((a, b) =>
       a.permission.localeCompare(b.permission),
     );
+    returnVal.version.systemConfigSchema = getSystemConfigSchema(
+      returnVal.version as unknown as ModuleVersionOutputDTO,
+    );
 
     return returnVal;
   }

diff --git a/packages/test/src/__snapshots__/ModuleController/Update.json b/packages/test/src/__snapshots__/ModuleController/Update.json
@@ -39,7 +39,9 @@
     "snapshot": true,
     "name": "Update",
     "expectedStatus": 200,
-    "filteredFields": [],
+    "filteredFields": [
+      "moduleId"
+    ],
     "standardEnvironment": true
   }
 }