N21-2103 fix tests and eslint

hpi-schul-cloud · Dec 20, 2024 · ab54ba5 · ab54ba5
1 parent 2a12aa9
commit ab54ba5
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 23 deletions.
diff --git a/apps/server/src/infra/sync/media-licenses/index.ts b/apps/server/src/infra/sync/media-licenses/index.ts
@@ -1,2 +1,3 @@
 export * from './service';
 export * from './strategy';
+export * from './vidis-sync-config';
diff --git a/apps/server/src/infra/sync/media-licenses/service/vidis-fetch.service.spec.ts b/apps/server/src/infra/sync/media-licenses/service/vidis-fetch.service.spec.ts
@@ -121,7 +121,7 @@ describe(VidisFetchService.name, () => {
 
 					const encodedBasicAuth = btoa(`${decryptedUsername}:${decryptedPassword}`);
 					const expectedAxiosOptions: RawAxiosRequestConfig = {
-						headers: { Authorization: expect.stringMatching(`Basic ${encodedBasicAuth}`) },
+						headers: { Authorization: expect.stringMatching(`Basic ${encodedBasicAuth}`) as string },
 					};
 
 					expect(vidisApiClientMock.getActivatedOffersByRegion).toBeCalledWith(

diff --git a/apps/server/src/infra/sync/media-licenses/service/vidis-sync.service.spec.ts b/apps/server/src/infra/sync/media-licenses/service/vidis-sync.service.spec.ts
@@ -53,7 +53,7 @@ describe(VidisSyncService.name, () => {
 	});
 
 	describe('syncMediaSchoolLicenses', () => {
-		describe('when the vidis media source and school activation items are given', () => {
+		describe('when the vidis media source and activated offer items are given', () => {
 			describe('when the school activations provided does not exist in SVS', () => {
 				const setup = () => {
 					const mediaSource = mediaSourceFactory.build();
@@ -64,9 +64,7 @@ describe(VidisSyncService.name, () => {
 						schoolFactory.build({ officialSchoolNumber })
 					);
 
-					mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId
-						.mockResolvedValueOnce([])
-						.mockResolvedValueOnce([]);
+					mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId.mockResolvedValue([]);
 					schoolService.getSchoolByOfficialSchoolNumber
 						.mockResolvedValueOnce(schools[0])
 						.mockResolvedValueOnce(schools[1])
@@ -117,9 +115,7 @@ describe(VidisSyncService.name, () => {
 						mediaSource,
 					});
 
-					mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId.mockResolvedValueOnce([
-						existingMediaSchoolLicense,
-					]);
+					mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId.mockResolvedValue([existingMediaSchoolLicense]);
 					schoolService.getSchoolById.mockResolvedValueOnce(school);
 					schoolService.getSchoolByOfficialSchoolNumber.mockResolvedValue(school);
 
@@ -142,7 +138,7 @@ describe(VidisSyncService.name, () => {
 				describe('when the school has an official school number', () => {
 					const setup = () => {
 						const mediaSource = mediaSourceFactory.build();
-						const items: OfferDTO[] = vidisOfferItemFactory.buildList(2, { schoolActivations: [] });
+						const items: OfferDTO[] = vidisOfferItemFactory.buildList(1, { schoolActivations: [] });
 						const school = schoolFactory.build({ officialSchoolNumber: '00100' });
 
 						const mediumId = `${items[0].offerId as number}`;
@@ -152,9 +148,9 @@ describe(VidisSyncService.name, () => {
 							mediaSource,
 						});
 
-						mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId.mockResolvedValueOnce([
-							existingMediaSchoolLicense,
-						]);
+						mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId
+							.mockResolvedValueOnce([existingMediaSchoolLicense])
+							.mockResolvedValueOnce([]);
 						schoolService.getSchoolById.mockResolvedValueOnce(school);
 						schoolService.getSchoolByOfficialSchoolNumber.mockResolvedValue(school);
 
@@ -177,7 +173,7 @@ describe(VidisSyncService.name, () => {
 				describe('when the school does not have an official school number', () => {
 					const setup = () => {
 						const mediaSource = mediaSourceFactory.build();
-						const items: OfferDTO[] = vidisOfferItemFactory.buildList(2, { schoolActivations: [] });
+						const items: OfferDTO[] = vidisOfferItemFactory.buildList(1, { schoolActivations: [] });
 						const school = schoolFactory.build({ officialSchoolNumber: undefined });
 
 						const mediumId = `${items[0].offerId as number}`;
@@ -187,9 +183,9 @@ describe(VidisSyncService.name, () => {
 							mediaSource,
 						});
 
-						mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId.mockResolvedValueOnce([
-							existingMediaSchoolLicense,
-						]);
+						mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId
+							.mockResolvedValueOnce([existingMediaSchoolLicense])
+							.mockResolvedValueOnce([existingMediaSchoolLicense]);
 						schoolService.getSchoolById.mockResolvedValueOnce(school);
 						schoolService.getSchoolByOfficialSchoolNumber.mockResolvedValue(null);
 
@@ -215,7 +211,7 @@ describe(VidisSyncService.name, () => {
 					const missingSchoolNumbers = ['00100', '00200'];
 					const items: OfferDTO[] = vidisOfferItemFactory.buildList(1, { schoolActivations: missingSchoolNumbers });
 
-					mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId.mockResolvedValueOnce([]);
+					mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId.mockResolvedValue([]);
 					schoolService.getSchoolByOfficialSchoolNumber.mockResolvedValue(null);
 
 					return {
@@ -247,7 +243,7 @@ describe(VidisSyncService.name, () => {
 						schoolFactory.build({ officialSchoolNumber })
 					);
 
-					mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId.mockResolvedValueOnce([]);
+					mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId.mockResolvedValue([]);
 					schoolService.getSchoolByOfficialSchoolNumber
 						.mockResolvedValueOnce(schools[0])
 						.mockResolvedValueOnce(schools[1])
@@ -290,7 +286,7 @@ describe(VidisSyncService.name, () => {
 						schoolFactory.build({ officialSchoolNumber })
 					);
 
-					mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId.mockResolvedValueOnce([]);
+					mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId.mockResolvedValue([]);
 					schoolService.getSchoolByOfficialSchoolNumber
 						.mockResolvedValueOnce(schools[0])
 						.mockResolvedValueOnce(schools[1])
@@ -321,6 +317,48 @@ describe(VidisSyncService.name, () => {
 					await expect(promise).resolves.not.toThrow();
 				});
 			});
+
+			describe('when the offer item does not has school activations', () => {
+				const setup = () => {
+					const mediaSource = mediaSourceFactory.build();
+					const schoolActivations = undefined;
+					const items: OfferDTO[] = vidisOfferItemFactory.buildList(1, { schoolActivations });
+
+					return {
+						mediaSource,
+						items,
+					};
+				};
+
+				it('should skip the offer item', async () => {
+					const { mediaSource, items } = setup();
+
+					await service.syncMediaSchoolLicenses(mediaSource, items);
+
+					expect(mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId).not.toHaveBeenCalled();
+				});
+			});
+
+			describe('when the offer item does not has a medium id', () => {
+				const setup = () => {
+					const mediaSource = mediaSourceFactory.build();
+					const schoolActivations = ['00100'];
+					const items: OfferDTO[] = vidisOfferItemFactory.buildList(1, { schoolActivations, offerId: undefined });
+
+					return {
+						mediaSource,
+						items,
+					};
+				};
+
+				it('should skip the offer item', async () => {
+					const { mediaSource, items } = setup();
+
+					await service.syncMediaSchoolLicenses(mediaSource, items);
+
+					expect(mediaSchoolLicenseService.findMediaSchoolLicensesByMediumId).not.toHaveBeenCalled();
+				});
+			});
 		});
 	});
 });
diff --git a/apps/server/src/infra/sync/media-licenses/service/vidis-sync.service.ts b/apps/server/src/infra/sync/media-licenses/service/vidis-sync.service.ts
@@ -40,10 +40,10 @@ export class VidisSyncService {
 					if (!school) {
 						this.logger.info(new SchoolForSchoolMediaLicenseSyncNotFoundLoggable(schoolNumber));
 					} else {
-						const isExistingLicense = !!existingLicenses.find(
+						const hasSchoolExistingLicense = existingLicenses.some(
 							(license: MediaSchoolLicense): boolean => license.schoolId === school.id
 						);
-						if (!isExistingLicense) {
+						if (!hasSchoolExistingLicense) {
 							const newLicense: MediaSchoolLicense = new MediaSchoolLicense({
 								id: new ObjectId().toHexString(),
 								type: SchoolLicenseType.MEDIA_LICENSE,

diff --git a/apps/server/src/modules/server/server.config.ts b/apps/server/src/modules/server/server.config.ts
@@ -6,6 +6,8 @@ import type { MailConfig } from '@infra/mail/interfaces/mail-config';
 import type { SchulconnexClientConfig } from '@infra/schulconnex-client';
 import { TspSyncConfig } from '@infra/sync';
 import type { TspClientConfig } from '@infra/tsp-client';
+import { VidisClientConfig } from '@infra/vidis-client';
+import { VidisSyncConfig } from '@infra/sync/media-licenses';
 import type { AccountConfig } from '@modules/account';
 import { AlertConfig } from '@modules/alert';
 import type { AuthenticationConfig } from '@modules/authentication';
@@ -32,8 +34,6 @@ import { SchulcloudTheme } from '@shared/domain/types';
 import type { CoreModuleConfig } from '@src/core';
 import { Algorithm } from 'jsonwebtoken';
 import type { Timezone } from './types/timezone.enum';
-import { VidisClientConfig } from '@infra/vidis-client';
-import { VidisSyncConfig } from '@infra/sync/media-licenses/vidis-sync-config';
 
 export enum NodeEnvType {
 	TEST = 'test',