From 5678c54ac05ca326ac8dad0834f47fae77c61cde Mon Sep 17 00:00:00 2001
From: davwas <daw.wasik@gmail.com>
Date: Tue, 12 Sep 2023 14:31:07 +0200
Subject: [PATCH] replace inject with injectStrict for schoolsModule

---
 .../AdminMigrationSection.unit.ts             |  8 +++++--
 .../administration/AdminMigrationSection.vue  | 22 +++++++------------
 .../administration/SchoolPolicy.unit.ts       |  3 ++-
 .../organisms/administration/SchoolPolicy.vue | 19 +++-------------
 .../SchoolPolicyFormDialog.unit.ts            |  3 ++-
 .../administration/SchoolPolicyFormDialog.vue | 11 +++-------
 .../administration/SchoolTerms.unit.ts        |  3 ++-
 .../organisms/administration/SchoolTerms.vue  | 19 +++-------------
 .../SchoolTermsFormDialog.unit.ts             |  3 ++-
 .../administration/SchoolTermsFormDialog.vue  | 11 +++-------
 src/main.ts                                   |  3 ++-
 src/utils/inject/injection-keys.ts            |  3 +++
 12 files changed, 39 insertions(+), 69 deletions(-)

diff --git a/src/components/administration/AdminMigrationSection.unit.ts b/src/components/administration/AdminMigrationSection.unit.ts
index 26a7a6b373..85ef7a01c4 100644
--- a/src/components/administration/AdminMigrationSection.unit.ts
+++ b/src/components/administration/AdminMigrationSection.unit.ts
@@ -1,7 +1,11 @@
 import AdminMigrationSection from "@/components/administration/AdminMigrationSection.vue";
 import EnvConfigModule from "@/store/env-config";
 import SchoolsModule from "@/store/schools";
-import { ENV_CONFIG_MODULE_KEY, I18N_KEY } from "@/utils/inject";
+import {
+	ENV_CONFIG_MODULE_KEY,
+	I18N_KEY,
+	SCHOOLS_MODULE_KEY,
+} from "@/utils/inject";
 import { createModuleMocks } from "@/utils/mock-store-module";
 import createComponentMocks from "@@/tests/test-utils/componentMocks";
 import { Wrapper, mount, shallowMount } from "@vue/test-utils";
@@ -39,7 +43,7 @@ describe("AdminMigrationSection", () => {
 			}),
 			provide: {
 				[I18N_KEY.valueOf()]: i18nMock,
-				schoolsModule,
+				[SCHOOLS_MODULE_KEY.valueOf()]: schoolsModule,
 				[ENV_CONFIG_MODULE_KEY.valueOf()]: envConfigModule,
 			},
 		});
diff --git a/src/components/administration/AdminMigrationSection.vue b/src/components/administration/AdminMigrationSection.vue
index 9478b5bc5b..5c1ff94502 100644
--- a/src/components/administration/AdminMigrationSection.vue
+++ b/src/components/administration/AdminMigrationSection.vue
@@ -169,23 +169,25 @@
 
 <script lang="ts">
 import { MigrationBody } from "@/serverApi/v3";
-import SchoolsModule from "@/store/schools";
 import { OauthMigration, School } from "@/store/types/schools";
-import { ENV_CONFIG_MODULE_KEY, I18N_KEY, injectStrict } from "@/utils/inject";
+import {
+	ENV_CONFIG_MODULE_KEY,
+	injectStrict,
+	SCHOOLS_MODULE_KEY,
+} from "@/utils/inject";
 import dayjs from "dayjs";
 import {
 	computed,
 	ComputedRef,
 	defineComponent,
-	inject,
 	onMounted,
 	ref,
 	Ref,
 	watch,
 } from "vue";
-import VueI18n from "vue-i18n";
 import MigrationWarningCard from "./MigrationWarningCard.vue";
 import { RenderHTML } from "@feature-render-html";
+import { useI18n } from "@/composables/i18n.composable";
 
 export default defineComponent({
 	name: "AdminMigrationSection",
@@ -194,22 +196,14 @@ export default defineComponent({
 		RenderHTML,
 	},
 	setup() {
-		const i18n = injectStrict(I18N_KEY);
+		const { t } = useI18n();
 		const envConfigModule = injectStrict(ENV_CONFIG_MODULE_KEY);
-		const schoolsModule: SchoolsModule | undefined =
-			inject<SchoolsModule>("schoolsModule");
-		if (!schoolsModule || !i18n) {
-			throw new Error("Injection of dependencies failed");
-		}
+		const schoolsModule = injectStrict(SCHOOLS_MODULE_KEY);
 
 		onMounted(async () => {
 			await schoolsModule.fetchSchoolOAuthMigration();
 		});
 
-		// TODO: https://ticketsystem.dbildungscloud.de/browse/BC-443
-		const t = (key: string, values?: VueI18n.Values): string =>
-			i18n.tc(key, 0, values);
-
 		const oauthMigration: ComputedRef<OauthMigration> = computed(
 			() => schoolsModule.getOauthMigration
 		);
diff --git a/src/components/organisms/administration/SchoolPolicy.unit.ts b/src/components/organisms/administration/SchoolPolicy.unit.ts
index dc23238128..077dbf2309 100644
--- a/src/components/organisms/administration/SchoolPolicy.unit.ts
+++ b/src/components/organisms/administration/SchoolPolicy.unit.ts
@@ -11,6 +11,7 @@ import {
 	AUTH_MODULE_KEY,
 	I18N_KEY,
 	PRIVACY_POLICY_MODULE_KEY,
+	SCHOOLS_MODULE_KEY,
 } from "@/utils/inject";
 import Vue from "vue";
 import { i18nMock } from "@@/tests/test-utils";
@@ -75,7 +76,7 @@ describe("SchoolPolicy", () => {
 				[I18N_KEY.valueOf()]: i18nMock,
 				[PRIVACY_POLICY_MODULE_KEY.valueOf()]: privacyPolicyModule,
 				[AUTH_MODULE_KEY.valueOf()]: authModule,
-				schoolsModule,
+				[SCHOOLS_MODULE_KEY.valueOf()]: schoolsModule,
 			},
 		});
 
diff --git a/src/components/organisms/administration/SchoolPolicy.vue b/src/components/organisms/administration/SchoolPolicy.vue
index c27dc8a051..fdf37bcf1a 100644
--- a/src/components/organisms/administration/SchoolPolicy.vue
+++ b/src/components/organisms/administration/SchoolPolicy.vue
@@ -97,16 +97,7 @@
 import SchoolPolicyFormDialog from "@/components/organisms/administration/SchoolPolicyFormDialog.vue";
 import dayjs from "dayjs";
 import { mdiPencilOutline, mdiTrayArrowDown } from "@mdi/js";
-import {
-	computed,
-	ComputedRef,
-	defineComponent,
-	inject,
-	ref,
-	Ref,
-	watch,
-} from "vue";
-import SchoolsModule from "@/store/schools";
+import { computed, ComputedRef, defineComponent, ref, Ref, watch } from "vue";
 import { School } from "@/store/types/schools";
 import { ConsentVersion } from "@/store/types/consent-version";
 import { BusinessError } from "@/store/types/commons";
@@ -115,6 +106,7 @@ import {
 	AUTH_MODULE_KEY,
 	PRIVACY_POLICY_MODULE_KEY,
 	injectStrict,
+	SCHOOLS_MODULE_KEY,
 } from "@/utils/inject";
 
 export default defineComponent({
@@ -126,12 +118,7 @@ export default defineComponent({
 		const { t } = useI18n();
 		const authModule = injectStrict(AUTH_MODULE_KEY);
 		const privacyPolicyModule = injectStrict(PRIVACY_POLICY_MODULE_KEY);
-		const schoolsModule: SchoolsModule | undefined =
-			inject<SchoolsModule>("schoolsModule");
-
-		if (!schoolsModule) {
-			throw new Error("Injection of dependencies failed");
-		}
+		const schoolsModule = injectStrict(SCHOOLS_MODULE_KEY);
 
 		const isSchoolPolicyFormDialogOpen: Ref<boolean> = ref(false);
 
diff --git a/src/components/organisms/administration/SchoolPolicyFormDialog.unit.ts b/src/components/organisms/administration/SchoolPolicyFormDialog.unit.ts
index 40d2efdf09..84f5241a27 100644
--- a/src/components/organisms/administration/SchoolPolicyFormDialog.unit.ts
+++ b/src/components/organisms/administration/SchoolPolicyFormDialog.unit.ts
@@ -11,6 +11,7 @@ import {
 	I18N_KEY,
 	NOTIFIER_MODULE_KEY,
 	PRIVACY_POLICY_MODULE_KEY,
+	SCHOOLS_MODULE_KEY,
 } from "@/utils/inject";
 import { i18nMock } from "@@/tests/test-utils";
 
@@ -57,7 +58,7 @@ describe("SchoolPolicyFormDialog", () => {
 					[I18N_KEY.valueOf()]: i18nMock,
 					[NOTIFIER_MODULE_KEY.valueOf()]: notifierModule,
 					[PRIVACY_POLICY_MODULE_KEY.valueOf()]: privacyPolicyModule,
-					schoolsModule,
+					[SCHOOLS_MODULE_KEY.valueOf()]: schoolsModule,
 				},
 				propsData: mockProps,
 			}
diff --git a/src/components/organisms/administration/SchoolPolicyFormDialog.vue b/src/components/organisms/administration/SchoolPolicyFormDialog.vue
index 4d6a648a0a..5ab2bf2ca0 100644
--- a/src/components/organisms/administration/SchoolPolicyFormDialog.vue
+++ b/src/components/organisms/administration/SchoolPolicyFormDialog.vue
@@ -77,12 +77,12 @@
 
 <script lang="ts">
 import vCustomDialog from "@/components/organisms/vCustomDialog.vue";
-import { computed, ComputedRef, defineComponent, inject, ref, Ref } from "vue";
-import SchoolsModule from "@/store/schools";
+import { computed, ComputedRef, defineComponent, ref, Ref } from "vue";
 import {
 	injectStrict,
 	NOTIFIER_MODULE_KEY,
 	PRIVACY_POLICY_MODULE_KEY,
+	SCHOOLS_MODULE_KEY,
 } from "@/utils/inject";
 import { mdiAlert, mdiFileReplaceOutline } from "@mdi/js";
 import { School } from "@/store/types/schools";
@@ -107,12 +107,7 @@ export default defineComponent({
 		const { t } = useI18n();
 		const privacyPolicyModule = injectStrict(PRIVACY_POLICY_MODULE_KEY);
 		const notifierModule = injectStrict(NOTIFIER_MODULE_KEY);
-		const schoolsModule: SchoolsModule | undefined =
-			inject<SchoolsModule>("schoolsModule");
-
-		if (!schoolsModule) {
-			throw new Error("Injection of dependencies failed");
-		}
+		const schoolsModule = injectStrict(SCHOOLS_MODULE_KEY);
 
 		const policyForm: Ref = ref(null);
 		const isValid: Ref<boolean> = ref(false);
diff --git a/src/components/organisms/administration/SchoolTerms.unit.ts b/src/components/organisms/administration/SchoolTerms.unit.ts
index 87b8db6e4e..6b56d1ae9e 100644
--- a/src/components/organisms/administration/SchoolTerms.unit.ts
+++ b/src/components/organisms/administration/SchoolTerms.unit.ts
@@ -10,6 +10,7 @@ import { ConsentVersion } from "@/store/types/consent-version";
 import {
 	AUTH_MODULE_KEY,
 	I18N_KEY,
+	SCHOOLS_MODULE_KEY,
 	TERMS_OF_USE_MODULE_KEY,
 } from "@/utils/inject";
 import Vue from "vue";
@@ -75,7 +76,7 @@ describe("SchoolTerms", () => {
 				[I18N_KEY.valueOf()]: i18nMock,
 				[TERMS_OF_USE_MODULE_KEY.valueOf()]: termsOfUseModule,
 				[AUTH_MODULE_KEY.valueOf()]: authModule,
-				schoolsModule,
+				[SCHOOLS_MODULE_KEY.valueOf()]: schoolsModule,
 			},
 		});
 
diff --git a/src/components/organisms/administration/SchoolTerms.vue b/src/components/organisms/administration/SchoolTerms.vue
index eb36a6d414..cd30c6b6f7 100644
--- a/src/components/organisms/administration/SchoolTerms.vue
+++ b/src/components/organisms/administration/SchoolTerms.vue
@@ -93,16 +93,7 @@
 import SchoolTermsFormDialog from "@/components/organisms/administration/SchoolTermsFormDialog.vue";
 import dayjs from "dayjs";
 import { mdiPencilOutline, mdiTrayArrowDown } from "@mdi/js";
-import {
-	computed,
-	ComputedRef,
-	defineComponent,
-	inject,
-	ref,
-	Ref,
-	watch,
-} from "vue";
-import SchoolsModule from "@/store/schools";
+import { computed, ComputedRef, defineComponent, ref, Ref, watch } from "vue";
 import { School } from "@/store/types/schools";
 import { ConsentVersion } from "@/store/types/consent-version";
 import { BusinessError } from "@/store/types/commons";
@@ -111,6 +102,7 @@ import {
 	injectStrict,
 	AUTH_MODULE_KEY,
 	TERMS_OF_USE_MODULE_KEY,
+	SCHOOLS_MODULE_KEY,
 } from "@/utils/inject";
 
 export default defineComponent({
@@ -122,12 +114,7 @@ export default defineComponent({
 		const { t } = useI18n();
 		const authModule = injectStrict(AUTH_MODULE_KEY);
 		const termsOfUseModule = injectStrict(TERMS_OF_USE_MODULE_KEY);
-		const schoolsModule: SchoolsModule | undefined =
-			inject<SchoolsModule>("schoolsModule");
-
-		if (!schoolsModule) {
-			throw new Error("Injection of dependencies failed");
-		}
+		const schoolsModule = injectStrict(SCHOOLS_MODULE_KEY);
 
 		const isSchoolTermsFormDialogOpen: Ref<boolean> = ref(false);
 
diff --git a/src/components/organisms/administration/SchoolTermsFormDialog.unit.ts b/src/components/organisms/administration/SchoolTermsFormDialog.unit.ts
index c8f9f89d94..28abfd76df 100644
--- a/src/components/organisms/administration/SchoolTermsFormDialog.unit.ts
+++ b/src/components/organisms/administration/SchoolTermsFormDialog.unit.ts
@@ -10,6 +10,7 @@ import Vue from "vue";
 import {
 	I18N_KEY,
 	NOTIFIER_MODULE_KEY,
+	SCHOOLS_MODULE_KEY,
 	TERMS_OF_USE_MODULE_KEY,
 } from "@/utils/inject";
 import { i18nMock } from "@@/tests/test-utils";
@@ -57,7 +58,7 @@ describe("SchoolPolicyFormDialog", () => {
 					[I18N_KEY.valueOf()]: i18nMock,
 					[NOTIFIER_MODULE_KEY.valueOf()]: notifierModule,
 					[TERMS_OF_USE_MODULE_KEY.valueOf()]: termsOfUseModule,
-					schoolsModule,
+					[SCHOOLS_MODULE_KEY.valueOf()]: schoolsModule,
 				},
 				propsData: mockProps,
 			}
diff --git a/src/components/organisms/administration/SchoolTermsFormDialog.vue b/src/components/organisms/administration/SchoolTermsFormDialog.vue
index 9f8da4f7ab..61b01909b4 100644
--- a/src/components/organisms/administration/SchoolTermsFormDialog.vue
+++ b/src/components/organisms/administration/SchoolTermsFormDialog.vue
@@ -75,11 +75,11 @@
 
 <script lang="ts">
 import vCustomDialog from "@/components/organisms/vCustomDialog.vue";
-import { computed, ComputedRef, defineComponent, inject, ref, Ref } from "vue";
-import SchoolsModule from "@/store/schools";
+import { computed, ComputedRef, defineComponent, ref, Ref } from "vue";
 import {
 	injectStrict,
 	NOTIFIER_MODULE_KEY,
+	SCHOOLS_MODULE_KEY,
 	TERMS_OF_USE_MODULE_KEY,
 } from "@/utils/inject";
 import { mdiAlert, mdiFileReplaceOutline } from "@mdi/js";
@@ -105,12 +105,7 @@ export default defineComponent({
 		const { t } = useI18n();
 		const termsOfUseModule = injectStrict(TERMS_OF_USE_MODULE_KEY);
 		const notifierModule = injectStrict(NOTIFIER_MODULE_KEY);
-		const schoolsModule: SchoolsModule | undefined =
-			inject<SchoolsModule>("schoolsModule");
-
-		if (!schoolsModule) {
-			throw new Error("Injection of dependencies failed");
-		}
+		const schoolsModule = injectStrict(SCHOOLS_MODULE_KEY);
 
 		const termsForm: Ref = ref(null);
 		const isFormValid: Ref<boolean> = ref(false);
diff --git a/src/main.ts b/src/main.ts
index 41d74d667d..107f6f673b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -70,6 +70,7 @@ import {
 	VIDEO_CONFERENCE_MODULE_KEY,
 	PRIVACY_POLICY_MODULE_KEY,
 	TERMS_OF_USE_MODULE_KEY,
+	SCHOOLS_MODULE_KEY,
 } from "./utils/inject";
 
 Vue.config.productionTip = false;
@@ -161,7 +162,7 @@ Vue.use(VueDOMPurifyHTML, {
 			[ROOM_MODULE_KEY.valueOf()]: roomModule,
 			roomsModule,
 			[SCHOOL_EXTERNAL_TOOLS_MODULE_KEY.valueOf()]: schoolExternalToolsModule,
-			schoolsModule,
+			[SCHOOLS_MODULE_KEY.valueOf()]: schoolsModule,
 			shareModule,
 			[STATUS_ALERTS_MODULE_KEY.valueOf()]: statusAlertsModule,
 			[SYSTEMS_MODULE_KEY.valueOf()]: systemsModule,
diff --git a/src/utils/inject/injection-keys.ts b/src/utils/inject/injection-keys.ts
index f299e75198..eb886347b6 100644
--- a/src/utils/inject/injection-keys.ts
+++ b/src/utils/inject/injection-keys.ts
@@ -14,6 +14,7 @@ import UserLoginMigrationModule from "@/store/user-login-migrations";
 import SystemsModule from "@/store/systems";
 import PrivacyPolicyModule from "@/store/privacy-policy";
 import TermsOfUseModule from "@/store/terms-of-use";
+import SchoolsModule from "@/store/schools";
 
 export const ENV_CONFIG_MODULE_KEY: InjectionKey<EnvConfigModule> =
 	Symbol("envConfigModule");
@@ -42,3 +43,5 @@ export const PRIVACY_POLICY_MODULE_KEY: InjectionKey<PrivacyPolicyModule> =
 	Symbol("privacyPolicyModule");
 export const TERMS_OF_USE_MODULE_KEY: InjectionKey<TermsOfUseModule> =
 	Symbol("termsOfUseModule");
+export const SCHOOLS_MODULE_KEY: InjectionKey<SchoolsModule> =
+	Symbol("schoolsModule");