N21-1494 move toolConfiguration status

hpi-schul-cloud · Nov 23, 2023 · 6659d21 · 6659d21
1 parent 1021f15
commit 6659d21
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 8 deletions.
diff --git a/apps/server/src/modules/tool/common/domain/index.ts b/apps/server/src/modules/tool/common/domain/index.ts
@@ -1,3 +1,3 @@
 export * from './custom-parameter.do';
 export * from './custom-parameter-entry.do';
-export * from '../enum/tool-configuration-status';
+export * from './tool-configuration-status';
diff --git a/.../common/enum/tool-configuration-status.ts → ...ommon/domain/tool-configuration-status.ts b/.../common/enum/tool-configuration-status.ts → ...ommon/domain/tool-configuration-status.ts
diff --git a/apps/server/src/modules/tool/common/enum/index.ts b/apps/server/src/modules/tool/common/enum/index.ts
@@ -10,4 +10,4 @@ export * from './tool-context-type.enum';
 export * from './custom-parameter-location.enum';
 export * from './custom-parameter-scope.enum';
 export * from './custom-parameter-type.enum';
-export * from './tool-configuration-status';
+export * from '../domain/tool-configuration-status';
diff --git a/apps/server/src/modules/tool/context-external-tool/service/tool-reference.service.spec.ts b/apps/server/src/modules/tool/context-external-tool/service/tool-reference.service.spec.ts
@@ -79,7 +79,15 @@ describe('ToolReferenceService', () => {
 				contextExternalToolService.findById.mockResolvedValueOnce(contextExternalTool);
 				schoolExternalToolService.findById.mockResolvedValueOnce(schoolExternalTool);
 				externalToolService.findById.mockResolvedValueOnce(externalTool);
-				toolVersionService.determineToolConfigurationStatus.mockResolvedValue(ToolConfigurationStatus.OUTDATED);
+				toolVersionService.determineToolConfigurationStatus.mockResolvedValue(
+					new ToolConfigurationStatus({
+						latest: false,
+						isDisabled: false,
+						isOutdatedOnScopeSchool: true,
+						isOutdatedOnScopeContext: false,
+						isUnkown: false,
+					})
+				);
 				externalToolLogoService.buildLogoUrl.mockReturnValue(logoUrl);
 
 				return {
@@ -123,7 +131,13 @@ describe('ToolReferenceService', () => {
 					logoUrl,
 					displayName: contextExternalTool.displayName as string,
 					openInNewTab: externalTool.openNewTab,
-					status: ToolConfigurationStatus.OUTDATED,
+					status: new ToolConfigurationStatus({
+						latest: false,
+						isDisabled: false,
+						isOutdatedOnScopeSchool: true,
+						isOutdatedOnScopeContext: false,
+						isUnkown: false,
+					}),
 					contextToolId: contextExternalToolId,
 				});
 			});

diff --git a/.../server/src/modules/tool/school-external-tool/controller/api-test/tool-school.api.spec.ts b/.../server/src/modules/tool/school-external-tool/controller/api-test/tool-school.api.spec.ts
@@ -140,7 +140,13 @@ describe('ToolSchoolController (API)', () => {
 				name: externalToolEntity.name,
 				schoolId: postParams.schoolId,
 				toolId: postParams.toolId,
-				status: ToolConfigurationStatusResponse.LATEST,
+				status: new ToolConfigurationStatusResponse({
+					latest: true,
+					isDisabled: false,
+					isOutdatedOnScopeSchool: false,
+					isOutdatedOnScopeContext: false,
+					isUnkown: false,
+				}),
 				toolVersion: postParams.version,
 				parameters: [
 					{ name: 'param1', value: 'value' },
@@ -297,7 +303,13 @@ describe('ToolSchoolController (API)', () => {
 							name: externalToolEntity.name,
 							schoolId: school.id,
 							toolId: externalToolEntity.id,
-							status: ToolConfigurationStatusResponse.OUTDATED,
+							status: new ToolConfigurationStatusResponse({
+								latest: false,
+								isDisabled: false,
+								isOutdatedOnScopeSchool: true,
+								isOutdatedOnScopeContext: false,
+								isUnkown: false,
+							}),
 							toolVersion: schoolExternalToolEntity.toolVersion,
 							parameters: [
 								{
@@ -340,7 +352,13 @@ describe('ToolSchoolController (API)', () => {
 				name: '',
 				schoolId: school.id,
 				toolId: externalToolEntity.id,
-				status: ToolConfigurationStatusResponse.UNKNOWN,
+				status: new ToolConfigurationStatusResponse({
+					latest: false,
+					isDisabled: false,
+					isOutdatedOnScopeSchool: false,
+					isOutdatedOnScopeContext: false,
+					isUnkown: true,
+				}),
 				toolVersion: schoolExternalToolEntity.toolVersion,
 				parameters: [
 					{
@@ -466,7 +484,13 @@ describe('ToolSchoolController (API)', () => {
 				name: externalToolEntity.name,
 				schoolId: postParamsUpdate.schoolId,
 				toolId: postParamsUpdate.toolId,
-				status: ToolConfigurationStatusResponse.LATEST,
+				status: new ToolConfigurationStatusResponse({
+					latest: true,
+					isDisabled: false,
+					isOutdatedOnScopeSchool: false,
+					isOutdatedOnScopeContext: false,
+					isUnkown: false,
+				}),
 				toolVersion: postParamsUpdate.version,
 				parameters: [
 					{