From 426e25bf3efdb15005cd35f81d805ce958147733 Mon Sep 17 00:00:00 2001
From: masterElmar <18119527+masterElmar@users.noreply.github.com>
Date: Mon, 20 Nov 2023 17:10:52 +0100
Subject: [PATCH 1/8] feat:#74 added security and refactored api endpoint

---
 backend/model/moduleModel.go           | 10 +++++-----
 backend/service/addRoute.go            | 18 ++++++------------
 backend/service/db/dbEvents.go         | 12 ++++++++++++
 backend/service/events/eventService.go |  7 ++-----
 frontend/src/api/fetchModule.ts        |  9 ++-------
 5 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/backend/model/moduleModel.go b/backend/model/moduleModel.go
index 422613d..438721e 100644
--- a/backend/model/moduleModel.go
+++ b/backend/model/moduleModel.go
@@ -1,10 +1,10 @@
 package model
 
 type Module struct {
-	UUID     string `json:"uuid"`
-	Name     string `json:"name"`
-	Prof     string `json:"prof"`
-	Course   string `json:"course"`
-	Semester string `json:"semester"`
+	UUID     string `json:"uuid" db:"uuid"`
+	Name     string `json:"name" db:"Name"`
+	Prof     string `json:"prof" db:"Prof"`
+	Course   string `json:"course" db:"course"`
+	Semester string `json:"semester" db:"semester"`
 	Events   Events `json:"events"`
 }
diff --git a/backend/service/addRoute.go b/backend/service/addRoute.go
index e43f911..b6f2e7d 100644
--- a/backend/service/addRoute.go
+++ b/backend/service/addRoute.go
@@ -1,7 +1,6 @@
 package service
 
 import (
-	"htwkalender/model"
 	"htwkalender/service/events"
 	"htwkalender/service/fetch"
 	"htwkalender/service/ical"
@@ -26,6 +25,7 @@ func AddRoutes(app *pocketbase.PocketBase) {
 			},
 			Middlewares: []echo.MiddlewareFunc{
 				apis.ActivityLogger(app),
+				apis.RequireAdminAuth(),
 			},
 		})
 		if err != nil {
@@ -61,6 +61,7 @@ func AddRoutes(app *pocketbase.PocketBase) {
 			},
 			Middlewares: []echo.MiddlewareFunc{
 				apis.ActivityLogger(app),
+				apis.RequireAdminAuth(),
 			},
 		})
 		if err != nil {
@@ -212,18 +213,11 @@ func AddRoutes(app *pocketbase.PocketBase) {
 
 	app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
 		_, err := e.Router.AddRoute(echo.Route{
-			Method: http.MethodPost,
+			Method: http.MethodGet,
 			Path:   "/api/module",
 			Handler: func(c echo.Context) error {
-
-				var requestModule model.Module
-
-				if err := c.Bind(&requestModule); err != nil {
-					return apis.NewBadRequestError("Failed to read request body", err)
-				}
-
-				module, err := events.GetModuleByName(app, requestModule)
-
+				requestModule := c.QueryParam("uuid")
+				module, err := events.GetModuleByUUID(app, requestModule)
 				if err != nil {
 					return c.JSON(400, err)
 				} else {
@@ -286,7 +280,7 @@ func AddRoutes(app *pocketbase.PocketBase) {
 	app.OnBeforeServe().Add(func(e *core.ServeEvent) error {
 		_, err := e.Router.AddRoute(echo.Route{
 			Method: http.MethodGet,
-			Path:   "/api/feed/migrate",
+			Path:   "/api/feeds/migrate",
 			Handler: func(c echo.Context) error {
 				err := ical.MigrateFeedJson(app)
 
diff --git a/backend/service/db/dbEvents.go b/backend/service/db/dbEvents.go
index 47f59db..e052b2e 100644
--- a/backend/service/db/dbEvents.go
+++ b/backend/service/db/dbEvents.go
@@ -196,6 +196,18 @@ func DeleteAllEvents(app *pocketbase.PocketBase) error {
 	return nil
 }
 
+func FindModuleByUUID(app *pocketbase.PocketBase, uuid string) (model.Module, error) {
+	var module model.Module
+
+	err := app.Dao().DB().Select("*").From("events").Where(dbx.NewExp("uuid = {:uuid}", dbx.Params{"uuid": uuid})).One(&module)
+	if err != nil {
+		print("Error while getting events from database: ", err)
+		return model.Module{}, err
+	}
+
+	return module, nil
+}
+
 func FindAllEventsByModule(app *pocketbase.PocketBase, module model.Module) (model.Events, error) {
 	var events model.Events
 
diff --git a/backend/service/events/eventService.go b/backend/service/events/eventService.go
index 4b646da..43a6c35 100644
--- a/backend/service/events/eventService.go
+++ b/backend/service/events/eventService.go
@@ -42,11 +42,8 @@ func GetAllModulesDistinct(app *pocketbase.PocketBase, c echo.Context) error {
 	}
 }
 
-// GetModuleByName returns a module by its name
-// If the module does not exist, an error is returned
-// If the module exists, the module is returned
-// Module is a struct that exists in database as events
-func GetModuleByName(app *pocketbase.PocketBase, module model.Module) (model.Module, error) {
+func GetModuleByUUID(app *pocketbase.PocketBase, uuid string) (model.Module, error) {
+	module, err := db.FindModuleByUUID(app, uuid)
 	events, err := db.FindAllEventsByModule(app, module)
 
 	if err != nil || len(events) == 0 {
diff --git a/frontend/src/api/fetchModule.ts b/frontend/src/api/fetchModule.ts
index 3a03519..85e843d 100644
--- a/frontend/src/api/fetchModule.ts
+++ b/frontend/src/api/fetchModule.ts
@@ -1,13 +1,8 @@
 import { Module } from "../model/module";
 
 export async function fetchModule(module: Module): Promise<Module> {
-  const request = new Request("/api/module", {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify(module),
-  });
+  // request to the backend on /api/module with query parameters name as the module name
+  const request = new Request("/api/module?uuid=" + module.uuid);
 
   return await fetch(request)
     .then((response) => {

From 42395e5f5a70b11d37d07b9d9ed87a2c216ac184 Mon Sep 17 00:00:00 2001
From: masterElmar <18119527+masterElmar@users.noreply.github.com>
Date: Mon, 20 Nov 2023 17:11:13 +0100
Subject: [PATCH 2/8] feat:#74 added readme and updated api documentation

---
 README.md           |   8 ++
 backend/openapi.yml | 173 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 179 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9411a3c..7d59d51 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,14 @@ htwkalender-demo
 
 Execute the following api calls to fetch data manually from HTWK and store it in the database:
 
+Both api calls need a token to be executed.
+You can get a token by logging in to the admin ui and copy the token from the local storage.
+Add this attribute to the request header of the api call:
+
+```
+Authorization : eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDE3MDA3ODQsImlkIjoicnA0Ym54YXNyczM5emR4IiwidHlwZSI6ImFkbWluIn0.j7Bt3-uaZ8CoNt8D9Oxjk7ZwvHDGZJy1xe3aq4BID3w
+```
+
 The first command will fetch all groups and store them in the database.
 This should be done quick in a few seconds (0-5s).
 When you execute the command again, it will update the groups in the 
diff --git a/backend/openapi.yml b/backend/openapi.yml
index 7f51ae3..69af1c5 100644
--- a/backend/openapi.yml
+++ b/backend/openapi.yml
@@ -11,30 +11,150 @@ paths:
   /api/fetchPlans:
     get:
       summary: Fetch Seminar Plans
+      security:
+        - ApiKeyAuth: []
       responses:
         '200':
           description: Successful response
   /api/fetchGroups:
     get:
       summary: Fetch Seminar Groups
+      security:
+        - ApiKeyAuth: []
       responses:
         '200':
           description: Successful response
+  /api/modules:
+    delete:
+        summary: Delete Module
+        security:
+            - ApiKeyAuth: []
+        responses:
+          '200':
+            description: Successful response
   /api/rooms:
     get:
       summary: Get Rooms
       responses:
         '200':
           description: Successful response
-  /api/feedURL:
+  /api/schedule/day:
     get:
-      summary: Get iCal Feed URL
+      summary: Get Day Schedule
+      parameters:
+        - name: room
+          in: query
+          description: room
+          example: "LN006-H"
+          required: true
+          schema:
+            type: string
+        - name: date
+          in: query
+          description: date
+          example: "2023-11-26"
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Successful response
+  /api/schedule:
+    get:
+      summary: Get Schedule
+      parameters:
+        - name: room
+          in: query
+          description: room
+          example: "LN006-H"
+          required: true
+          schema:
+            type: string
+        - name: from
+          in: query
+          description: date
+          example: "2023-11-26"
+          required: true
+          schema:
+            type: string
+        - name: to
+          in: query
+          description: date
+          example: "2023-11-30"
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Successful response
+  /api/createFeed:
+    post:
+      summary: Create iCal Feed
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                $ref: '#/components/schemas/Module'
+              required:
+                - name
+                - modules
       responses:
         '200':
           description: Successful response
   /api/feed:
     get:
       summary: Get iCal Feed for calendar
+      parameters:
+        - name: token
+          in: query
+          description: calendar token
+          required: true
+          example: "ldluwzg3e73ffxq"
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Successful response
+  /api/course/modules:
+    get:
+      summary: Get Modules for Course
+      parameters:
+        - name: course
+          in: query
+          description: course
+          required: true
+          example: "Software Engineering"
+          schema:
+            type: string
+        - name: semester
+          in: query
+          description: semester
+          required: true
+          example: "ws"
+          schema:
+              type: string
+      responses:
+        '200':
+          description: Successful response
+  /api/module:
+    get:
+      summary: Get Module
+      parameters:
+        - name: uuid
+          in: query
+          description: uuid
+          required: true
+          example: "d0b3a0e0-2f1a-4e1a-8b0a-0b9e1a0b9e1a"
+          schema:
+              type: string
+      responses:
+        '200':
+          description: Successful response
+  /api/courses:
+    get:
+      summary: Get Courses
       responses:
         '200':
           description: Successful response
@@ -51,3 +171,52 @@ paths:
       responses:
         '200':
           description: Successful response
+  /api/events:
+    delete:
+        summary: Delete Event
+        security:
+            - ApiKeyAuth: []
+        responses:
+          '200':
+            description: Successful response
+  /api/feeds/migrate:
+    get:
+      summary: Migrates all iCal Feeds in the database to the new format
+      security:
+        - ApiKeyAuth: []
+      responses:
+        '200':
+          description: Successful response
+security:
+  - ApiKeyAuth: []
+components:
+    securitySchemes:
+      ApiKeyAuth:
+        type: apiKey
+        in: header
+        name: Authorization
+    schemas:
+      Module:
+        type: object
+        properties:
+          name:
+            type: string
+            description: name
+            example: "Software Engineering"
+          uuid:
+            type: string
+            format: uuid
+          course:
+            type: string
+          userDefinedName:
+            type: string
+          prof:
+            type: string
+          semester:
+            type: string
+          reminder:
+            type: boolean
+          events:
+            type: array
+            items:
+              type: string
\ No newline at end of file

From bdf95059dd9d2fb25f44478150436553173aed65 Mon Sep 17 00:00:00 2001
From: masterElmar <18119527+masterElmar@users.noreply.github.com>
Date: Mon, 20 Nov 2023 18:33:07 +0100
Subject: [PATCH 3/8] feat:#69 added translation for edit pages

---
 .../editCalendar/EditAdditionalModules.vue    | 26 ++++++++++++++-----
 .../components/editCalendar/EditModules.vue   | 22 +++++++++-------
 frontend/src/i18n/translations/de.json        |  2 +-
 frontend/src/i18n/translations/en.json        |  2 +-
 frontend/src/view/AdditionalModules.vue       | 10 +++----
 5 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/frontend/src/components/editCalendar/EditAdditionalModules.vue b/frontend/src/components/editCalendar/EditAdditionalModules.vue
index fb968fc..5eff5e9 100644
--- a/frontend/src/components/editCalendar/EditAdditionalModules.vue
+++ b/frontend/src/components/editCalendar/EditAdditionalModules.vue
@@ -1,13 +1,16 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, ref, Ref } from "vue";
-import { Module } from "../../model/module";
-import { fetchAllModules } from "../../api/fetchCourse";
+import { Module } from "@/model/module.ts";
+import { fetchAllModules } from "@/api/fetchCourse.ts";
 import moduleStore from "../../store/moduleStore";
 import { MultiSelectAllChangeEvent } from "primevue/multiselect";
 import router from "../../router";
-import { fetchModule } from "../../api/fetchModule";
+import { fetchModule } from "@/api/fetchModule.ts";
 import { useDialog } from "primevue/usedialog";
+import {useI18n} from "vue-i18n";
+
 const dialog = useDialog();
+const { t } = useI18n({ useScope: "global" });
 
 const fetchedModules = async () => {
   return await fetchAllModules();
@@ -70,14 +73,21 @@ const onSelectAllChange = (event: MultiSelectAllChangeEvent) => {
 function selectChange() {
   selectAll.value = selectedModules.value.length === modules.value.length;
 }
+
+function itemsLabel(selectedModules: Module[]): string {
+  return (selectedModules ? selectedModules.length : 0) != 1 ? t("additionalModules.modules") : t("additionalModules.module");
+}
+
+function itemsLabelWithNumber(selectedModules: Module[]): string {
+  return selectedModules.length.toString() + " " + itemsLabel(selectedModules) + " " + t("additionalModules.dropDownFooterSelected");
+}
 </script>
 
 <template>
   <div class="flex flex-column">
     <div class="flex align-items-center justify-content-center h-4rem m-2">
       <h3>
-        Select additional Modules that are not listed in the regular semester
-        for your Course
+        {{ $t("additionalModules.subTitle") }}
       </h3>
     </div>
     <div class="card flex align-items-center justify-content-center m-2">
@@ -90,10 +100,12 @@ function selectChange() {
         :virtual-scroller-options="{ itemSize: 70 }"
         class="custom-multiselect"
         filter
-        placeholder="Select additional modules"
+        :placeholder="$t('additionalModules.dropDown')"
         :auto-filter-focus="true"
+        :show-toggle-all="false"
         @change="selectChange()"
         @selectall-change="onSelectAllChange($event)"
+        :selectedItemsLabel="itemsLabelWithNumber(selectedModules)"
       >
         <template #option="slotProps">
           <div class="flex justify-content-between w-full">
@@ -127,7 +139,7 @@ function selectChange() {
       </MultiSelect>
     </div>
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <Button @click="nextStep()">Next Step</Button>
+      <Button @click="nextStep()">{{ $t("additionalModules.nextStep") }}</Button>
     </div>
   </div>
 </template>
diff --git a/frontend/src/components/editCalendar/EditModules.vue b/frontend/src/components/editCalendar/EditModules.vue
index 44cfa5e..16bfa44 100644
--- a/frontend/src/components/editCalendar/EditModules.vue
+++ b/frontend/src/components/editCalendar/EditModules.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup>
 import { computed, Ref, ref } from "vue";
-import { Module } from "../../model/module";
+import { Module } from "@/model/module.ts";
 import moduleStore from "../../store/moduleStore";
-import { fetchAllModules } from "../../api/fetchCourse";
-import { saveIndividualFeed } from "../../api/createFeed";
+import { fetchAllModules } from "@/api/fetchCourse.ts";
+import { saveIndividualFeed } from "@/api/createFeed.ts";
 import tokenStore from "../../store/tokenStore";
 import router from "../../router";
 import ModuleTemplateDialog from "../ModuleTemplateDialog.vue";
-import { onlyWhitespace } from "../../helpers/strings.ts";
+import { onlyWhitespace } from "@/helpers/strings.ts";
+import { useI18n } from "vue-i18n";
+const { t } = useI18n({ useScope: "global" });
 
 const tableData = computed(() =>
   moduleStore().modules.map((module: Module) => {
@@ -19,9 +21,9 @@ const tableData = computed(() =>
 );
 
 const columns = ref([
-  { field: "Course", header: "Course" },
-  { field: "Module", header: "Module" },
-  { field: "Reminder", header: "Reminder" },
+  { field: "Course", header: t("moduleInformation.course") },
+  { field: "Module", header: t("moduleInformation.module") },
+  { field: "Reminder", header: t("renameModules.reminder") },
 ]);
 
 const fetchedModules = async () => {
@@ -51,7 +53,7 @@ async function finalStep() {
 <template>
   <div class="flex flex-column card-container mx-8 mt-2">
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <h3>Rename your selected Modules to your liking.</h3>
+      <h3>{{ $t("renameModules.subTitle") }}</h3>
       <ModuleTemplateDialog />
     </div>
     <div
@@ -65,7 +67,7 @@ async function finalStep() {
       >
         <template #header>
           <div class="flex align-items-center justify-content-end">
-            Enable all notifications:
+            {{ $t("renameModules.enableAllNotifications") }}
             <InputSwitch
               class="mx-4"
               :model-value="
@@ -152,7 +154,7 @@ async function finalStep() {
     <div
       class="flex align-items-center justify-content-center border-round m-2"
     >
-      <Button label="Save Calendar" @click="finalStep()" />
+      <Button @click="finalStep()" >{{ $t("renameModules.nextStep") }}</Button>
     </div>
   </div>
 </template>
diff --git a/frontend/src/i18n/translations/de.json b/frontend/src/i18n/translations/de.json
index 4dd8efa..00a3e26 100644
--- a/frontend/src/i18n/translations/de.json
+++ b/frontend/src/i18n/translations/de.json
@@ -63,7 +63,7 @@
     "reminder": "Erinnerung",
     "enableAllNotifications": "Alle Benachrichtigungen aktivieren",
     "subTitle": "Konfigurieren Sie die ausgewählten Module nach Ihren Wünschen.",
-    "nextStep": "Weiter"
+    "nextStep": "Speichern"
   },
   "moduleTemplateDialog": {
     "explanationOne": "Hier können Module nach Wunsch umbenannt werden, welche dann als Anzeigename im Kalender dargestellt werden.",
diff --git a/frontend/src/i18n/translations/en.json b/frontend/src/i18n/translations/en.json
index 641d5b9..5107b07 100644
--- a/frontend/src/i18n/translations/en.json
+++ b/frontend/src/i18n/translations/en.json
@@ -63,7 +63,7 @@
     "reminder": "reminder",
     "enableAllNotifications": "enable all notifications",
     "subTitle": "Configure your selected Modules to your liking.",
-    "nextStep": "next step"
+    "nextStep": "Save"
   },
   "moduleTemplateDialog": {
     "explanationOne": "Here you can rename your modules to your liking. This will be the name of the event in your calendar.",
diff --git a/frontend/src/view/AdditionalModules.vue b/frontend/src/view/AdditionalModules.vue
index 4e6582f..252f155 100644
--- a/frontend/src/view/AdditionalModules.vue
+++ b/frontend/src/view/AdditionalModules.vue
@@ -131,16 +131,16 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
         <template #footer>
           <div class="py-2 px-3">
             <b>{{ selectedModules ? selectedModules.length : 0 }}</b>
-            {{ itemsLabel(selectedModules) }}
-            {{ $t("additionalModules.dropDownFooterSelected") }}
+            item{{
+              (selectedModules ? selectedModules.length : 0) > 1 ? "s" : ""
+            }}
+            selected.
           </div>
         </template>
       </MultiSelect>
     </div>
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <Button @click="nextStep()">{{
-        $t("additionalModules.nextStep")
-      }}</Button>
+      <Button @click="nextStep()">{{ $t("additionalModules.nextStep") }}</Button>
     </div>
   </div>
 </template>

From 104861eb73ed76aa8a02e998f851d0f2c6ec9ac8 Mon Sep 17 00:00:00 2001
From: masterElmar <18119527+masterElmar@users.noreply.github.com>
Date: Mon, 20 Nov 2023 18:38:01 +0100
Subject: [PATCH 4/8] fix:#69 format, lint, tiny info buttons

---
 frontend/src/components/FaqPage.vue           | 211 ++++++++++++------
 frontend/src/components/ModuleInformation.vue |  37 ++-
 .../editCalendar/EditAdditionalModules.vue    |  33 ++-
 .../components/editCalendar/EditModules.vue   |  10 +-
 frontend/src/i18n/translations/de.json        |  14 +-
 frontend/src/view/AdditionalModules.vue       |  39 +++-
 frontend/src/view/EditCalendarView.vue        |  12 +-
 frontend/src/view/ImprintPage.vue             |   2 +-
 frontend/src/view/PrivacyPolicy.vue           |   2 +-
 9 files changed, 246 insertions(+), 114 deletions(-)

diff --git a/frontend/src/components/FaqPage.vue b/frontend/src/components/FaqPage.vue
index cdb8efa..9296436 100644
--- a/frontend/src/components/FaqPage.vue
+++ b/frontend/src/components/FaqPage.vue
@@ -1,141 +1,216 @@
-<script lang="ts" setup>
-</script>
+<script lang="ts" setup></script>
 
 <template>
   <div class="flex align-items-center justify-content-center flex-column">
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <h1>{{$t('faqView.headline')}}</h1>
+      <h1>{{ $t("faqView.headline") }}</h1>
     </div>
 
     <div class="flex flex-column col-7">
       <div class="grid my-2">
         <div class="col">
-          {{$t('faqView.firstQuestion')}}
+          {{ $t("faqView.firstQuestion") }}
         </div>
         <div class="col">
-          {{$t('faqView.firstAnswer')}}
+          {{ $t("faqView.firstAnswer") }}
         </div>
       </div>
       <div class="grid my-2">
-        <div class="col">{{$t('faqView.secondQuestion')}}</div>
+        <div class="col">{{ $t("faqView.secondQuestion") }}</div>
         <div class="col">
-          {{$t('faqView.secondAnswer')}}
+          {{ $t("faqView.secondAnswer") }}
         </div>
       </div>
 
       <div class="grid my-2">
-        <div class="col">{{$t('faqView.thirdQuestion')}}</div>
+        <div class="col">{{ $t("faqView.thirdQuestion") }}</div>
         <div class="col">
           <Accordion>
             <AccordionTab :header="$t('faqView.thirdAnswer.tabTitle')">
               <ol>
-                <li>{{$t('faqView.thirdAnswer.google.first')}}</li>
+                <li>{{ $t("faqView.thirdAnswer.google.first") }}</li>
                 <li>
-                  {{$t('faqView.thirdAnswer.google.second')}}
+                  {{ $t("faqView.thirdAnswer.google.second") }}
                 </li>
                 <li>
-                  {{$t('faqView.thirdAnswer.google.third')}}
+                  {{ $t("faqView.thirdAnswer.google.third") }}
                 </li>
               </ol>
             </AccordionTab>
-            <AccordionTab :header="$t('faqView.thirdAnswer.microsoft_outlook.title')">
-              <p>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.title')}}</p>
+            <AccordionTab
+              :header="$t('faqView.thirdAnswer.microsoft_outlook.title')"
+            >
+              <p>
+                {{
+                  $t("faqView.thirdAnswer.microsoft_outlook.outlook_2010.title")
+                }}
+              </p>
 
               <ol>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.first')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.second')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.third')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.fourth')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.fifth')}}</li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2010.first",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2010.second",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2010.third",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2010.fourth",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2010.fifth",
+                    )
+                  }}
+                </li>
               </ol>
 
-              <p>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.title')}}</p>
+              <p>
+                {{
+                  $t("faqView.thirdAnswer.microsoft_outlook.outlook_2007.title")
+                }}
+              </p>
 
               <ol>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.first')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.second')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.third')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.fourth')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.fifth')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.sixth')}}</li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2007.first",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2007.second",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2007.third",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2007.fourth",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2007.fifth",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2007.sixth",
+                    )
+                  }}
+                </li>
               </ol>
             </AccordionTab>
             <AccordionTab :header="$t('faqView.thirdAnswer.apple_osx.title')">
               <ol>
-                <li>{{$t('faqView.thirdAnswer.apple_osx.first')}}</li>
-                <li>{{$t('faqView.thirdAnswer.apple_osx.second')}}</li>
-                <li>{{$t('faqView.thirdAnswer.apple_osx.third')}}</li>
-                <li>{{$t('faqView.thirdAnswer.apple_osx.fourth')}}</li>
+                <li>{{ $t("faqView.thirdAnswer.apple_osx.first") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.apple_osx.second") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.apple_osx.third") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.apple_osx.fourth") }}</li>
               </ol>
             </AccordionTab>
             <AccordionTab :header="$t('faqView.thirdAnswer.thunderbird.title')">
               <ol>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.one') }}</li>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.two') }}</li>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.three') }}</li>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.four') }} </li>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.five') }}</li>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.six') }}</li>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.seven') }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.one") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.two") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.three") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.four") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.five") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.six") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.seven") }}</li>
               </ol>
             </AccordionTab>
             <AccordionTab :header="$t('faqView.thirdAnswer.iphone.title')">
-              <p>{{$t('faqView.thirdAnswer.iphone.description')}}</p>
+              <p>{{ $t("faqView.thirdAnswer.iphone.description") }}</p>
 
               <ol>
-                <li>{{$t('faqView.thirdAnswer.iphone.one')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.two')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.three')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.four')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.five')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.six')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.seven')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.eight')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.nine')}}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.one") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.two") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.three") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.four") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.five") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.six") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.seven") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.eight") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.nine") }}</li>
               </ol>
             </AccordionTab>
             <AccordionTab header="Android">
-              <p>{{$t('faqView.thirdAnswer.android.description')}}</p>
+              <p>{{ $t("faqView.thirdAnswer.android.description") }}</p>
             </AccordionTab>
             <AccordionTab header="Windows Phone">
-              <p>{{$t('faqView.thirdAnswer.windows_phone.description')}}</p>
+              <p>{{ $t("faqView.thirdAnswer.windows_phone.description") }}</p>
               <ol>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.one')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.two')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.three')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.four')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.five')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.six')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.seven')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.eight')}}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.one") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.two") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.three") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.four") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.five") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.six") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.seven") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.eight") }}</li>
               </ol>
             </AccordionTab>
           </Accordion>
         </div>
       </div>
       <div class="grid my-2">
-        <div class="col">{{$t('faqView.fourthQuestion')}}</div>
-        <div class="col">{{$t('faqView.fourthAnswer')}}</div>
+        <div class="col">{{ $t("faqView.fourthQuestion") }}</div>
+        <div class="col">{{ $t("faqView.fourthAnswer") }}</div>
       </div>
       <div class="grid my-2">
-        <div class="col">{{$t('faqView.fifthQuestion')}}</div>
-        <div class="col">{{$t('faqView.fifthAnswer')}}</div>
+        <div class="col">{{ $t("faqView.fifthQuestion") }}</div>
+        <div class="col">{{ $t("faqView.fifthAnswer") }}</div>
       </div>
       <div class="grid my-2">
-        <div class="col my-2">{{$t('faqView.sixthQuestion')}}</div>
-        <div class="col">{{$t('faqView.sixthAnswer')}}</div>
+        <div class="col my-2">{{ $t("faqView.sixthQuestion") }}</div>
+        <div class="col">{{ $t("faqView.sixthAnswer") }}</div>
       </div>
       <div class="grid my-2">
-        <div class="col">{{$t('faqView.seventhQuestion')}}</div>
-        <div class="col">{{$t('faqView.seventhAnswer')}}</div>
+        <div class="col">{{ $t("faqView.seventhQuestion") }}</div>
+        <div class="col">{{ $t("faqView.seventhAnswer") }}</div>
       </div>
       <div class="grid my-2">
-        <div class="col">{{$t('faqView.eighthQuestion')}}</div>
-        <div class="col">{{$t('faqView.eighthAnswer')}}</div>
+        <div class="col">{{ $t("faqView.eighthQuestion") }}</div>
+        <div class="col">{{ $t("faqView.eighthAnswer") }}</div>
       </div>
       <p>
-        {{$t('faqView.notFound')}}<br />
-        <a href="/imprint">{{$t('faqView.contact')}}</a>
+        {{ $t("faqView.notFound") }}<br />
+        <a href="/imprint">{{ $t("faqView.contact") }}</a>
       </p>
     </div>
   </div>
diff --git a/frontend/src/components/ModuleInformation.vue b/frontend/src/components/ModuleInformation.vue
index 893a917..902e6ec 100644
--- a/frontend/src/components/ModuleInformation.vue
+++ b/frontend/src/components/ModuleInformation.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import {inject} from "vue";
-import {Module} from "../model/module.ts";
-import {Event} from "../model/event.ts";
+import { inject } from "vue";
+import { Module } from "../model/module.ts";
+import { Event } from "../model/event.ts";
 import moment from "moment-timezone";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -14,10 +14,10 @@ function formatTimestamp(timestampString: string): string {
   const timestamp = moment(timestampString);
 
   // Die Zeitzone auf "Europe/Berlin" setzen
-  const berlinTime = timestamp.tz('Europe/Berlin');
+  const berlinTime = timestamp.tz("Europe/Berlin");
 
   // Das gewünschte Format für die Ausgabe festlegen
-  return berlinTime.format('DD.MM.YYYY HH:mm');
+  return berlinTime.format("DD.MM.YYYY HH:mm");
 }
 
 function sortModuleEventsByStart(events: Event[]) {
@@ -43,8 +43,14 @@ function sortModuleEventsByStart(events: Event[]) {
       <tr>
         <td>
           <div class="card">
-            <DataTable :value="sortModuleEventsByStart(module.events)" table-style="min-width: 50rem">
-              <Column field="day" :header="$t('moduleInformation.day')"></Column>
+            <DataTable
+              :value="sortModuleEventsByStart(module.events)"
+              table-style="min-width: 50rem"
+            >
+              <Column
+                field="day"
+                :header="$t('moduleInformation.day')"
+              ></Column>
               <Column field="start" :header="$t('moduleInformation.start')">
                 <template #body="slotProps">
                   {{ formatTimestamp(slotProps.data.start) }}
@@ -52,12 +58,21 @@ function sortModuleEventsByStart(events: Event[]) {
               </Column>
               <Column field="end" :header="$t('moduleInformation.end')">
                 <template #body="slotProps">
-                  {{formatTimestamp( slotProps.data.end) }}
+                  {{ formatTimestamp(slotProps.data.end) }}
                 </template>
               </Column>
-              <Column field="rooms" :header="$t('moduleInformation.room')"></Column>
-              <Column field="eventType" :header="$t('moduleInformation.type')"></Column>
-              <Column field="week" :header="$t('moduleInformation.week')"></Column>
+              <Column
+                field="rooms"
+                :header="$t('moduleInformation.room')"
+              ></Column>
+              <Column
+                field="eventType"
+                :header="$t('moduleInformation.type')"
+              ></Column>
+              <Column
+                field="week"
+                :header="$t('moduleInformation.week')"
+              ></Column>
             </DataTable>
           </div>
         </td>
diff --git a/frontend/src/components/editCalendar/EditAdditionalModules.vue b/frontend/src/components/editCalendar/EditAdditionalModules.vue
index 5eff5e9..4c99aa1 100644
--- a/frontend/src/components/editCalendar/EditAdditionalModules.vue
+++ b/frontend/src/components/editCalendar/EditAdditionalModules.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup>
 import { defineAsyncComponent, ref, Ref } from "vue";
-import { Module } from "@/model/module.ts";
-import { fetchAllModules } from "@/api/fetchCourse.ts";
+import { Module } from "../../model/module.ts";
+import { fetchAllModules } from "../../api/fetchCourse.ts";
 import moduleStore from "../../store/moduleStore";
 import { MultiSelectAllChangeEvent } from "primevue/multiselect";
 import router from "../../router";
-import { fetchModule } from "@/api/fetchModule.ts";
+import { fetchModule } from "../../api/fetchModule.ts";
 import { useDialog } from "primevue/usedialog";
-import {useI18n} from "vue-i18n";
+import { useI18n } from "vue-i18n";
 
 const dialog = useDialog();
 const { t } = useI18n({ useScope: "global" });
@@ -75,11 +75,19 @@ function selectChange() {
 }
 
 function itemsLabel(selectedModules: Module[]): string {
-  return (selectedModules ? selectedModules.length : 0) != 1 ? t("additionalModules.modules") : t("additionalModules.module");
+  return (selectedModules ? selectedModules.length : 0) != 1
+    ? t("additionalModules.modules")
+    : t("additionalModules.module");
 }
 
 function itemsLabelWithNumber(selectedModules: Module[]): string {
-  return selectedModules.length.toString() + " " + itemsLabel(selectedModules) + " " + t("additionalModules.dropDownFooterSelected");
+  return (
+    selectedModules.length.toString() +
+    " " +
+    itemsLabel(selectedModules) +
+    " " +
+    t("additionalModules.dropDownFooterSelected")
+  );
 }
 </script>
 
@@ -103,9 +111,9 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
         :placeholder="$t('additionalModules.dropDown')"
         :auto-filter-focus="true"
         :show-toggle-all="false"
+        :selected-items-label="itemsLabelWithNumber(selectedModules)"
         @change="selectChange()"
         @selectall-change="onSelectAllChange($event)"
-        :selectedItemsLabel="itemsLabelWithNumber(selectedModules)"
       >
         <template #option="slotProps">
           <div class="flex justify-content-between w-full">
@@ -116,6 +124,7 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
             </div>
             <div class="flex align-items-center justify-content-center ml-2">
               <Button
+                class="small-button"
                 icon="pi pi-info"
                 severity="secondary"
                 rounded
@@ -139,7 +148,9 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
       </MultiSelect>
     </div>
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <Button @click="nextStep()">{{ $t("additionalModules.nextStep") }}</Button>
+      <Button @click="nextStep()">{{
+        $t("additionalModules.nextStep")
+      }}</Button>
     </div>
   </div>
 </template>
@@ -152,4 +163,10 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
 :deep(.custom-multiselect li) {
   height: unset;
 }
+
+.small-button.p-button {
+  width: 2rem;
+  height: 2rem;
+  padding: 0;
+}
 </style>
diff --git a/frontend/src/components/editCalendar/EditModules.vue b/frontend/src/components/editCalendar/EditModules.vue
index 16bfa44..bb5c3f6 100644
--- a/frontend/src/components/editCalendar/EditModules.vue
+++ b/frontend/src/components/editCalendar/EditModules.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup>
 import { computed, Ref, ref } from "vue";
-import { Module } from "@/model/module.ts";
+import { Module } from "../../model/module.ts";
 import moduleStore from "../../store/moduleStore";
-import { fetchAllModules } from "@/api/fetchCourse.ts";
-import { saveIndividualFeed } from "@/api/createFeed.ts";
+import { fetchAllModules } from "../../api/fetchCourse.ts";
+import { saveIndividualFeed } from "../../api/createFeed.ts";
 import tokenStore from "../../store/tokenStore";
 import router from "../../router";
 import ModuleTemplateDialog from "../ModuleTemplateDialog.vue";
-import { onlyWhitespace } from "@/helpers/strings.ts";
+import { onlyWhitespace } from "../../helpers/strings.ts";
 import { useI18n } from "vue-i18n";
 const { t } = useI18n({ useScope: "global" });
 
@@ -154,7 +154,7 @@ async function finalStep() {
     <div
       class="flex align-items-center justify-content-center border-round m-2"
     >
-      <Button @click="finalStep()" >{{ $t("renameModules.nextStep") }}</Button>
+      <Button @click="finalStep()">{{ $t("renameModules.nextStep") }}</Button>
     </div>
   </div>
 </template>
diff --git a/frontend/src/i18n/translations/de.json b/frontend/src/i18n/translations/de.json
index 00a3e26..c4f54d6 100644
--- a/frontend/src/i18n/translations/de.json
+++ b/frontend/src/i18n/translations/de.json
@@ -132,13 +132,13 @@
       },
       "thunderbird": {
         "title": "Thunderbird",
-        "one" : "Erstelle deinen Kalender und kopiere den Link.",
-        "two" : "Im Menü “Termine und Aufgaben” den Punkt “Kalender” wählen. ",
-        "three" : "Links siehst du die Kalenderübersicht. In diesem Bereich über die rechte Maustaste klicken und im darauf erscheinenden Kontextmenü “Neuer Kalender” anklicken.",
-        "four" : "Du hast die Wahl zwischen “Auf meinem Computer” und “Im Netzwerk”. Bitte letzteres wählen und “Fortsetzen” klicken.",
-        "five" : "Im folgenden Fenster lässt du das “Format” wie es ist (“iCalender”).",
-        "six" : "Unter \"Adresse\" den kopierten Kalenderlink einfügen.",
-        "seven" : "Anschließend kannst du noch einen Namen vergeben und weitere Einstellungen nach Belieben vornehmen."
+        "one": "Erstelle deinen Kalender und kopiere den Link.",
+        "two": "Im Menü “Termine und Aufgaben” den Punkt “Kalender” wählen. ",
+        "three": "Links siehst du die Kalenderübersicht. In diesem Bereich über die rechte Maustaste klicken und im darauf erscheinenden Kontextmenü “Neuer Kalender” anklicken.",
+        "four": "Du hast die Wahl zwischen “Auf meinem Computer” und “Im Netzwerk”. Bitte letzteres wählen und “Fortsetzen” klicken.",
+        "five": "Im folgenden Fenster lässt du das “Format” wie es ist (“iCalender”).",
+        "six": "Unter \"Adresse\" den kopierten Kalenderlink einfügen.",
+        "seven": "Anschließend kannst du noch einen Namen vergeben und weitere Einstellungen nach Belieben vornehmen."
       },
       "iphone": {
         "title": "iPhone",
diff --git a/frontend/src/view/AdditionalModules.vue b/frontend/src/view/AdditionalModules.vue
index 252f155..bbb647e 100644
--- a/frontend/src/view/AdditionalModules.vue
+++ b/frontend/src/view/AdditionalModules.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup>
-import {defineAsyncComponent, ref, Ref} from "vue";
-import {Module} from "../model/module.ts";
-import {fetchAllModules} from "../api/fetchCourse.ts";
+import { defineAsyncComponent, ref, Ref } from "vue";
+import { Module } from "../model/module.ts";
+import { fetchAllModules } from "../api/fetchCourse.ts";
 import moduleStore from "../store/moduleStore.ts";
-import {MultiSelectAllChangeEvent} from "primevue/multiselect";
+import { MultiSelectAllChangeEvent } from "primevue/multiselect";
 import router from "../router";
-import {fetchModule} from "../api/fetchModule.ts";
-import {useDialog} from "primevue/usedialog";
-import {useI18n} from "vue-i18n";
+import { fetchModule } from "../api/fetchModule.ts";
+import { useDialog } from "primevue/usedialog";
+import { useI18n } from "vue-i18n";
 
 const dialog = useDialog();
 const { t } = useI18n({ useScope: "global" });
@@ -76,11 +76,19 @@ function selectChange() {
 }
 
 function itemsLabel(selectedModules: Module[]): string {
-  return (selectedModules ? selectedModules.length : 0) != 1 ? t("additionalModules.modules") : t("additionalModules.module");
+  return (selectedModules ? selectedModules.length : 0) != 1
+    ? t("additionalModules.modules")
+    : t("additionalModules.module");
 }
 
 function itemsLabelWithNumber(selectedModules: Module[]): string {
-  return selectedModules.length.toString() + " " + itemsLabel(selectedModules) + " " + t("additionalModules.dropDownFooterSelected");
+  return (
+    selectedModules.length.toString() +
+    " " +
+    itemsLabel(selectedModules) +
+    " " +
+    t("additionalModules.dropDownFooterSelected")
+  );
 }
 </script>
 
@@ -104,9 +112,9 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
         :placeholder="$t('additionalModules.dropDown')"
         :auto-filter-focus="true"
         :show-toggle-all="false"
+        :selected-items-label="itemsLabelWithNumber(selectedModules)"
         @change="selectChange()"
         @selectall-change="onSelectAllChange($event)"
-        :selectedItemsLabel="itemsLabelWithNumber(selectedModules)"
       >
         <template #option="slotProps">
           <div class="flex justify-content-between w-full">
@@ -117,6 +125,7 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
             </div>
             <div class="flex align-items-center justify-content-center ml-2">
               <Button
+                class="small-button"
                 icon="pi pi-info"
                 severity="secondary"
                 rounded
@@ -140,7 +149,9 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
       </MultiSelect>
     </div>
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <Button @click="nextStep()">{{ $t("additionalModules.nextStep") }}</Button>
+      <Button @click="nextStep()">{{
+        $t("additionalModules.nextStep")
+      }}</Button>
     </div>
   </div>
 </template>
@@ -153,4 +164,10 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
 :deep(.custom-multiselect li) {
   height: unset;
 }
+
+.small-button.p-button {
+  width: 2rem;
+  height: 2rem;
+  padding: 0;
+}
 </style>
diff --git a/frontend/src/view/EditCalendarView.vue b/frontend/src/view/EditCalendarView.vue
index e0fa2dc..50a2de5 100644
--- a/frontend/src/view/EditCalendarView.vue
+++ b/frontend/src/view/EditCalendarView.vue
@@ -77,12 +77,20 @@ function loadCalendar(): void {
     <div
       class="flex align-items-center justify-content-center border-round m-2"
     >
-      <InputText v-model="token" type="text" autofocus @keyup.enter="loadCalendar" />
+      <InputText
+        v-model="token"
+        type="text"
+        autofocus
+        @keyup.enter="loadCalendar"
+      />
     </div>
     <div
       class="flex align-items-center justify-content-center border-round m-2"
     >
-      <Button :label="$t('editCalendarView.loadCalendar')" @click="loadCalendar" />
+      <Button
+        :label="$t('editCalendarView.loadCalendar')"
+        @click="loadCalendar"
+      />
     </div>
   </div>
 </template>
diff --git a/frontend/src/view/ImprintPage.vue b/frontend/src/view/ImprintPage.vue
index 0d6c69b..cb4297b 100644
--- a/frontend/src/view/ImprintPage.vue
+++ b/frontend/src/view/ImprintPage.vue
@@ -3,7 +3,7 @@
 <template>
   <div class="flex align-items-center justify-content-center flex-column">
     <div class="flex align-items-center justify-content-center h-4rem mt-2">
-      <h3 class="text-4xl">{{$t("imprint")}}</h3>
+      <h3 class="text-4xl">{{ $t("imprint") }}</h3>
     </div>
     <div class="flex flex-column col-7">
       <p>nach dem Telemediengesetz (TMG) der Bundesrepublik Deutschland.</p>
diff --git a/frontend/src/view/PrivacyPolicy.vue b/frontend/src/view/PrivacyPolicy.vue
index 0d44f8c..3f00f32 100644
--- a/frontend/src/view/PrivacyPolicy.vue
+++ b/frontend/src/view/PrivacyPolicy.vue
@@ -3,7 +3,7 @@
 <template>
   <div class="flex align-items-center justify-content-center flex-column">
     <div class="flex align-items-center justify-content-center h-4rem mt-2">
-      <h3 class="text-4xl">{{$t("privacy")}}</h3>
+      <h3 class="text-4xl">{{ $t("privacy") }}</h3>
     </div>
     <div class="flex flex-column col-7">
       <h1>Datenschutzerklärung</h1>

From cf07db861f764740926d59d6d4b8895b12f51644 Mon Sep 17 00:00:00 2001
From: masterElmar <18119527+masterElmar@users.noreply.github.com>
Date: Mon, 20 Nov 2023 21:11:42 +0100
Subject: [PATCH 5/8] fix:#79 added check for token and response feedback with
 toast

---
 frontend/src/api/loadCalendar.ts       |  7 +++++--
 frontend/src/i18n/translations/de.json |  3 ++-
 frontend/src/i18n/translations/en.json |  3 ++-
 frontend/src/view/EditCalendarView.vue | 21 +++++++++++++++------
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/frontend/src/api/loadCalendar.ts b/frontend/src/api/loadCalendar.ts
index 6ec03aa..0a665fe 100644
--- a/frontend/src/api/loadCalendar.ts
+++ b/frontend/src/api/loadCalendar.ts
@@ -8,7 +8,10 @@ export async function getCalender(token: string): Promise<Module[]> {
 
   return await fetch(request)
     .then((response) => {
-      return response.json();
+      if( response.ok){
+        return response.json().then((calendarResponse: Calendar) => calendarResponse.modules)
+      } else {
+        return [];
+      }
     })
-    .then((calendarResponse: Calendar) => calendarResponse.modules);
 }
diff --git a/frontend/src/i18n/translations/de.json b/frontend/src/i18n/translations/de.json
index 4dd8efa..672fc61 100644
--- a/frontend/src/i18n/translations/de.json
+++ b/frontend/src/i18n/translations/de.json
@@ -49,7 +49,8 @@
     "invalidToken": "Ungültiger Token",
     "headline": "Bearbeite deinen HTWKalender",
     "subTitle": "Füge deinen Link oder Token ein um den Kalender zu bearbeiten",
-    "loadCalendar": "Kalender laden"
+    "loadCalendar": "Kalender laden",
+    "noCalendarFound": "Keinen Kalender gefunden"
   },
   "additionalModules": {
     "subTitle": "Füge weitere Module hinzu die nicht in deinem Studiengang enthalten sind.",
diff --git a/frontend/src/i18n/translations/en.json b/frontend/src/i18n/translations/en.json
index 641d5b9..2f55add 100644
--- a/frontend/src/i18n/translations/en.json
+++ b/frontend/src/i18n/translations/en.json
@@ -49,7 +49,8 @@
     "invalidToken": "invalid token",
     "headline": "edit your HTWKalender",
     "subTitle": "please enter your link or calendar token",
-    "loadCalendar": "load calendar"
+    "loadCalendar": "load calendar",
+    "noCalendarFound": "no calendar found"
   },
   "additionalModules": {
     "subTitle": "Select additional Modules that are not listed in the regular semester for your Course",
diff --git a/frontend/src/view/EditCalendarView.vue b/frontend/src/view/EditCalendarView.vue
index e0fa2dc..a0b9b9e 100644
--- a/frontend/src/view/EditCalendarView.vue
+++ b/frontend/src/view/EditCalendarView.vue
@@ -46,14 +46,23 @@ function loadCalendar(): void {
   moduleStore().removeAllModules();
   tokenStore().setToken(token.value);
 
-  getCalender(token.value).then((data) => {
-    data.forEach((module) => {
-      moduleStore().addModule(module);
-    });
-    modules.value = data;
+  getCalender(token.value).then((data: Module[]) => {
+    if (data.length > 0) {
+      data.forEach((module) => {
+        moduleStore().addModule(module);
+      });
+      modules.value = data;
+      router.push("/edit-additional-modules");
+    } else {
+      toast.add({
+        severity: "error",
+        summary: t("editCalendarView.error"),
+        detail: t("editCalendarView.noCalendarFound"),
+        life: 3000,
+      });
+    }
   });
 
-  router.push("/edit-additional-modules");
 }
 </script>
 

From 3814a4712de8d3c52aec2dbd337adb4db63fd3db Mon Sep 17 00:00:00 2001
From: masterElmar <18119527+masterElmar@users.noreply.github.com>
Date: Mon, 20 Nov 2023 21:13:27 +0100
Subject: [PATCH 6/8] fix:#79 lint and format

---
 frontend/src/api/loadCalendar.ts              |  17 +-
 frontend/src/components/FaqPage.vue           | 211 ++++++++++++------
 frontend/src/components/ModuleInformation.vue |  37 ++-
 frontend/src/i18n/translations/de.json        |  14 +-
 frontend/src/view/AdditionalModules.vue       |  28 ++-
 frontend/src/view/EditCalendarView.vue        |  13 +-
 frontend/src/view/ImprintPage.vue             |   2 +-
 frontend/src/view/PrivacyPolicy.vue           |   2 +-
 8 files changed, 215 insertions(+), 109 deletions(-)

diff --git a/frontend/src/api/loadCalendar.ts b/frontend/src/api/loadCalendar.ts
index 0a665fe..d833c4d 100644
--- a/frontend/src/api/loadCalendar.ts
+++ b/frontend/src/api/loadCalendar.ts
@@ -6,12 +6,13 @@ export async function getCalender(token: string): Promise<Module[]> {
     method: "GET",
   });
 
-  return await fetch(request)
-    .then((response) => {
-      if( response.ok){
-        return response.json().then((calendarResponse: Calendar) => calendarResponse.modules)
-      } else {
-        return [];
-      }
-    })
+  return await fetch(request).then((response) => {
+    if (response.ok) {
+      return response
+        .json()
+        .then((calendarResponse: Calendar) => calendarResponse.modules);
+    } else {
+      return [];
+    }
+  });
 }
diff --git a/frontend/src/components/FaqPage.vue b/frontend/src/components/FaqPage.vue
index cdb8efa..9296436 100644
--- a/frontend/src/components/FaqPage.vue
+++ b/frontend/src/components/FaqPage.vue
@@ -1,141 +1,216 @@
-<script lang="ts" setup>
-</script>
+<script lang="ts" setup></script>
 
 <template>
   <div class="flex align-items-center justify-content-center flex-column">
     <div class="flex align-items-center justify-content-center h-4rem m-2">
-      <h1>{{$t('faqView.headline')}}</h1>
+      <h1>{{ $t("faqView.headline") }}</h1>
     </div>
 
     <div class="flex flex-column col-7">
       <div class="grid my-2">
         <div class="col">
-          {{$t('faqView.firstQuestion')}}
+          {{ $t("faqView.firstQuestion") }}
         </div>
         <div class="col">
-          {{$t('faqView.firstAnswer')}}
+          {{ $t("faqView.firstAnswer") }}
         </div>
       </div>
       <div class="grid my-2">
-        <div class="col">{{$t('faqView.secondQuestion')}}</div>
+        <div class="col">{{ $t("faqView.secondQuestion") }}</div>
         <div class="col">
-          {{$t('faqView.secondAnswer')}}
+          {{ $t("faqView.secondAnswer") }}
         </div>
       </div>
 
       <div class="grid my-2">
-        <div class="col">{{$t('faqView.thirdQuestion')}}</div>
+        <div class="col">{{ $t("faqView.thirdQuestion") }}</div>
         <div class="col">
           <Accordion>
             <AccordionTab :header="$t('faqView.thirdAnswer.tabTitle')">
               <ol>
-                <li>{{$t('faqView.thirdAnswer.google.first')}}</li>
+                <li>{{ $t("faqView.thirdAnswer.google.first") }}</li>
                 <li>
-                  {{$t('faqView.thirdAnswer.google.second')}}
+                  {{ $t("faqView.thirdAnswer.google.second") }}
                 </li>
                 <li>
-                  {{$t('faqView.thirdAnswer.google.third')}}
+                  {{ $t("faqView.thirdAnswer.google.third") }}
                 </li>
               </ol>
             </AccordionTab>
-            <AccordionTab :header="$t('faqView.thirdAnswer.microsoft_outlook.title')">
-              <p>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.title')}}</p>
+            <AccordionTab
+              :header="$t('faqView.thirdAnswer.microsoft_outlook.title')"
+            >
+              <p>
+                {{
+                  $t("faqView.thirdAnswer.microsoft_outlook.outlook_2010.title")
+                }}
+              </p>
 
               <ol>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.first')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.second')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.third')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.fourth')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2010.fifth')}}</li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2010.first",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2010.second",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2010.third",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2010.fourth",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2010.fifth",
+                    )
+                  }}
+                </li>
               </ol>
 
-              <p>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.title')}}</p>
+              <p>
+                {{
+                  $t("faqView.thirdAnswer.microsoft_outlook.outlook_2007.title")
+                }}
+              </p>
 
               <ol>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.first')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.second')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.third')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.fourth')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.fifth')}}</li>
-                <li>{{$t('faqView.thirdAnswer.microsoft_outlook.outlook_2007.sixth')}}</li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2007.first",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2007.second",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2007.third",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2007.fourth",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2007.fifth",
+                    )
+                  }}
+                </li>
+                <li>
+                  {{
+                    $t(
+                      "faqView.thirdAnswer.microsoft_outlook.outlook_2007.sixth",
+                    )
+                  }}
+                </li>
               </ol>
             </AccordionTab>
             <AccordionTab :header="$t('faqView.thirdAnswer.apple_osx.title')">
               <ol>
-                <li>{{$t('faqView.thirdAnswer.apple_osx.first')}}</li>
-                <li>{{$t('faqView.thirdAnswer.apple_osx.second')}}</li>
-                <li>{{$t('faqView.thirdAnswer.apple_osx.third')}}</li>
-                <li>{{$t('faqView.thirdAnswer.apple_osx.fourth')}}</li>
+                <li>{{ $t("faqView.thirdAnswer.apple_osx.first") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.apple_osx.second") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.apple_osx.third") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.apple_osx.fourth") }}</li>
               </ol>
             </AccordionTab>
             <AccordionTab :header="$t('faqView.thirdAnswer.thunderbird.title')">
               <ol>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.one') }}</li>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.two') }}</li>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.three') }}</li>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.four') }} </li>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.five') }}</li>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.six') }}</li>
-                <li>{{ $t('faqView.thirdAnswer.thunderbird.seven') }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.one") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.two") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.three") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.four") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.five") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.six") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.thunderbird.seven") }}</li>
               </ol>
             </AccordionTab>
             <AccordionTab :header="$t('faqView.thirdAnswer.iphone.title')">
-              <p>{{$t('faqView.thirdAnswer.iphone.description')}}</p>
+              <p>{{ $t("faqView.thirdAnswer.iphone.description") }}</p>
 
               <ol>
-                <li>{{$t('faqView.thirdAnswer.iphone.one')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.two')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.three')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.four')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.five')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.six')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.seven')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.eight')}}</li>
-                <li>{{$t('faqView.thirdAnswer.iphone.nine')}}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.one") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.two") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.three") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.four") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.five") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.six") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.seven") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.eight") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.iphone.nine") }}</li>
               </ol>
             </AccordionTab>
             <AccordionTab header="Android">
-              <p>{{$t('faqView.thirdAnswer.android.description')}}</p>
+              <p>{{ $t("faqView.thirdAnswer.android.description") }}</p>
             </AccordionTab>
             <AccordionTab header="Windows Phone">
-              <p>{{$t('faqView.thirdAnswer.windows_phone.description')}}</p>
+              <p>{{ $t("faqView.thirdAnswer.windows_phone.description") }}</p>
               <ol>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.one')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.two')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.three')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.four')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.five')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.six')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.seven')}}</li>
-                <li>{{$t('faqView.thirdAnswer.windows_phone.eight')}}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.one") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.two") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.three") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.four") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.five") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.six") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.seven") }}</li>
+                <li>{{ $t("faqView.thirdAnswer.windows_phone.eight") }}</li>
               </ol>
             </AccordionTab>
           </Accordion>
         </div>
       </div>
       <div class="grid my-2">
-        <div class="col">{{$t('faqView.fourthQuestion')}}</div>
-        <div class="col">{{$t('faqView.fourthAnswer')}}</div>
+        <div class="col">{{ $t("faqView.fourthQuestion") }}</div>
+        <div class="col">{{ $t("faqView.fourthAnswer") }}</div>
       </div>
       <div class="grid my-2">
-        <div class="col">{{$t('faqView.fifthQuestion')}}</div>
-        <div class="col">{{$t('faqView.fifthAnswer')}}</div>
+        <div class="col">{{ $t("faqView.fifthQuestion") }}</div>
+        <div class="col">{{ $t("faqView.fifthAnswer") }}</div>
       </div>
       <div class="grid my-2">
-        <div class="col my-2">{{$t('faqView.sixthQuestion')}}</div>
-        <div class="col">{{$t('faqView.sixthAnswer')}}</div>
+        <div class="col my-2">{{ $t("faqView.sixthQuestion") }}</div>
+        <div class="col">{{ $t("faqView.sixthAnswer") }}</div>
       </div>
       <div class="grid my-2">
-        <div class="col">{{$t('faqView.seventhQuestion')}}</div>
-        <div class="col">{{$t('faqView.seventhAnswer')}}</div>
+        <div class="col">{{ $t("faqView.seventhQuestion") }}</div>
+        <div class="col">{{ $t("faqView.seventhAnswer") }}</div>
       </div>
       <div class="grid my-2">
-        <div class="col">{{$t('faqView.eighthQuestion')}}</div>
-        <div class="col">{{$t('faqView.eighthAnswer')}}</div>
+        <div class="col">{{ $t("faqView.eighthQuestion") }}</div>
+        <div class="col">{{ $t("faqView.eighthAnswer") }}</div>
       </div>
       <p>
-        {{$t('faqView.notFound')}}<br />
-        <a href="/imprint">{{$t('faqView.contact')}}</a>
+        {{ $t("faqView.notFound") }}<br />
+        <a href="/imprint">{{ $t("faqView.contact") }}</a>
       </p>
     </div>
   </div>
diff --git a/frontend/src/components/ModuleInformation.vue b/frontend/src/components/ModuleInformation.vue
index 893a917..902e6ec 100644
--- a/frontend/src/components/ModuleInformation.vue
+++ b/frontend/src/components/ModuleInformation.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
-import {inject} from "vue";
-import {Module} from "../model/module.ts";
-import {Event} from "../model/event.ts";
+import { inject } from "vue";
+import { Module } from "../model/module.ts";
+import { Event } from "../model/event.ts";
 import moment from "moment-timezone";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -14,10 +14,10 @@ function formatTimestamp(timestampString: string): string {
   const timestamp = moment(timestampString);
 
   // Die Zeitzone auf "Europe/Berlin" setzen
-  const berlinTime = timestamp.tz('Europe/Berlin');
+  const berlinTime = timestamp.tz("Europe/Berlin");
 
   // Das gewünschte Format für die Ausgabe festlegen
-  return berlinTime.format('DD.MM.YYYY HH:mm');
+  return berlinTime.format("DD.MM.YYYY HH:mm");
 }
 
 function sortModuleEventsByStart(events: Event[]) {
@@ -43,8 +43,14 @@ function sortModuleEventsByStart(events: Event[]) {
       <tr>
         <td>
           <div class="card">
-            <DataTable :value="sortModuleEventsByStart(module.events)" table-style="min-width: 50rem">
-              <Column field="day" :header="$t('moduleInformation.day')"></Column>
+            <DataTable
+              :value="sortModuleEventsByStart(module.events)"
+              table-style="min-width: 50rem"
+            >
+              <Column
+                field="day"
+                :header="$t('moduleInformation.day')"
+              ></Column>
               <Column field="start" :header="$t('moduleInformation.start')">
                 <template #body="slotProps">
                   {{ formatTimestamp(slotProps.data.start) }}
@@ -52,12 +58,21 @@ function sortModuleEventsByStart(events: Event[]) {
               </Column>
               <Column field="end" :header="$t('moduleInformation.end')">
                 <template #body="slotProps">
-                  {{formatTimestamp( slotProps.data.end) }}
+                  {{ formatTimestamp(slotProps.data.end) }}
                 </template>
               </Column>
-              <Column field="rooms" :header="$t('moduleInformation.room')"></Column>
-              <Column field="eventType" :header="$t('moduleInformation.type')"></Column>
-              <Column field="week" :header="$t('moduleInformation.week')"></Column>
+              <Column
+                field="rooms"
+                :header="$t('moduleInformation.room')"
+              ></Column>
+              <Column
+                field="eventType"
+                :header="$t('moduleInformation.type')"
+              ></Column>
+              <Column
+                field="week"
+                :header="$t('moduleInformation.week')"
+              ></Column>
             </DataTable>
           </div>
         </td>
diff --git a/frontend/src/i18n/translations/de.json b/frontend/src/i18n/translations/de.json
index 672fc61..74abebf 100644
--- a/frontend/src/i18n/translations/de.json
+++ b/frontend/src/i18n/translations/de.json
@@ -133,13 +133,13 @@
       },
       "thunderbird": {
         "title": "Thunderbird",
-        "one" : "Erstelle deinen Kalender und kopiere den Link.",
-        "two" : "Im Menü “Termine und Aufgaben” den Punkt “Kalender” wählen. ",
-        "three" : "Links siehst du die Kalenderübersicht. In diesem Bereich über die rechte Maustaste klicken und im darauf erscheinenden Kontextmenü “Neuer Kalender” anklicken.",
-        "four" : "Du hast die Wahl zwischen “Auf meinem Computer” und “Im Netzwerk”. Bitte letzteres wählen und “Fortsetzen” klicken.",
-        "five" : "Im folgenden Fenster lässt du das “Format” wie es ist (“iCalender”).",
-        "six" : "Unter \"Adresse\" den kopierten Kalenderlink einfügen.",
-        "seven" : "Anschließend kannst du noch einen Namen vergeben und weitere Einstellungen nach Belieben vornehmen."
+        "one": "Erstelle deinen Kalender und kopiere den Link.",
+        "two": "Im Menü “Termine und Aufgaben” den Punkt “Kalender” wählen. ",
+        "three": "Links siehst du die Kalenderübersicht. In diesem Bereich über die rechte Maustaste klicken und im darauf erscheinenden Kontextmenü “Neuer Kalender” anklicken.",
+        "four": "Du hast die Wahl zwischen “Auf meinem Computer” und “Im Netzwerk”. Bitte letzteres wählen und “Fortsetzen” klicken.",
+        "five": "Im folgenden Fenster lässt du das “Format” wie es ist (“iCalender”).",
+        "six": "Unter \"Adresse\" den kopierten Kalenderlink einfügen.",
+        "seven": "Anschließend kannst du noch einen Namen vergeben und weitere Einstellungen nach Belieben vornehmen."
       },
       "iphone": {
         "title": "iPhone",
diff --git a/frontend/src/view/AdditionalModules.vue b/frontend/src/view/AdditionalModules.vue
index 4e6582f..cf26aee 100644
--- a/frontend/src/view/AdditionalModules.vue
+++ b/frontend/src/view/AdditionalModules.vue
@@ -1,13 +1,13 @@
 <script lang="ts" setup>
-import {defineAsyncComponent, ref, Ref} from "vue";
-import {Module} from "../model/module.ts";
-import {fetchAllModules} from "../api/fetchCourse.ts";
+import { defineAsyncComponent, ref, Ref } from "vue";
+import { Module } from "../model/module.ts";
+import { fetchAllModules } from "../api/fetchCourse.ts";
 import moduleStore from "../store/moduleStore.ts";
-import {MultiSelectAllChangeEvent} from "primevue/multiselect";
+import { MultiSelectAllChangeEvent } from "primevue/multiselect";
 import router from "../router";
-import {fetchModule} from "../api/fetchModule.ts";
-import {useDialog} from "primevue/usedialog";
-import {useI18n} from "vue-i18n";
+import { fetchModule } from "../api/fetchModule.ts";
+import { useDialog } from "primevue/usedialog";
+import { useI18n } from "vue-i18n";
 
 const dialog = useDialog();
 const { t } = useI18n({ useScope: "global" });
@@ -76,11 +76,19 @@ function selectChange() {
 }
 
 function itemsLabel(selectedModules: Module[]): string {
-  return (selectedModules ? selectedModules.length : 0) != 1 ? t("additionalModules.modules") : t("additionalModules.module");
+  return (selectedModules ? selectedModules.length : 0) != 1
+    ? t("additionalModules.modules")
+    : t("additionalModules.module");
 }
 
 function itemsLabelWithNumber(selectedModules: Module[]): string {
-  return selectedModules.length.toString() + " " + itemsLabel(selectedModules) + " " + t("additionalModules.dropDownFooterSelected");
+  return (
+    selectedModules.length.toString() +
+    " " +
+    itemsLabel(selectedModules) +
+    " " +
+    t("additionalModules.dropDownFooterSelected")
+  );
 }
 </script>
 
@@ -104,9 +112,9 @@ function itemsLabelWithNumber(selectedModules: Module[]): string {
         :placeholder="$t('additionalModules.dropDown')"
         :auto-filter-focus="true"
         :show-toggle-all="false"
+        :selected-items-label="itemsLabelWithNumber(selectedModules)"
         @change="selectChange()"
         @selectall-change="onSelectAllChange($event)"
-        :selectedItemsLabel="itemsLabelWithNumber(selectedModules)"
       >
         <template #option="slotProps">
           <div class="flex justify-content-between w-full">
diff --git a/frontend/src/view/EditCalendarView.vue b/frontend/src/view/EditCalendarView.vue
index a0b9b9e..ae80c71 100644
--- a/frontend/src/view/EditCalendarView.vue
+++ b/frontend/src/view/EditCalendarView.vue
@@ -62,7 +62,6 @@ function loadCalendar(): void {
       });
     }
   });
-
 }
 </script>
 
@@ -86,12 +85,20 @@ function loadCalendar(): void {
     <div
       class="flex align-items-center justify-content-center border-round m-2"
     >
-      <InputText v-model="token" type="text" autofocus @keyup.enter="loadCalendar" />
+      <InputText
+        v-model="token"
+        type="text"
+        autofocus
+        @keyup.enter="loadCalendar"
+      />
     </div>
     <div
       class="flex align-items-center justify-content-center border-round m-2"
     >
-      <Button :label="$t('editCalendarView.loadCalendar')" @click="loadCalendar" />
+      <Button
+        :label="$t('editCalendarView.loadCalendar')"
+        @click="loadCalendar"
+      />
     </div>
   </div>
 </template>
diff --git a/frontend/src/view/ImprintPage.vue b/frontend/src/view/ImprintPage.vue
index 0d6c69b..cb4297b 100644
--- a/frontend/src/view/ImprintPage.vue
+++ b/frontend/src/view/ImprintPage.vue
@@ -3,7 +3,7 @@
 <template>
   <div class="flex align-items-center justify-content-center flex-column">
     <div class="flex align-items-center justify-content-center h-4rem mt-2">
-      <h3 class="text-4xl">{{$t("imprint")}}</h3>
+      <h3 class="text-4xl">{{ $t("imprint") }}</h3>
     </div>
     <div class="flex flex-column col-7">
       <p>nach dem Telemediengesetz (TMG) der Bundesrepublik Deutschland.</p>
diff --git a/frontend/src/view/PrivacyPolicy.vue b/frontend/src/view/PrivacyPolicy.vue
index 0d44f8c..3f00f32 100644
--- a/frontend/src/view/PrivacyPolicy.vue
+++ b/frontend/src/view/PrivacyPolicy.vue
@@ -3,7 +3,7 @@
 <template>
   <div class="flex align-items-center justify-content-center flex-column">
     <div class="flex align-items-center justify-content-center h-4rem mt-2">
-      <h3 class="text-4xl">{{$t("privacy")}}</h3>
+      <h3 class="text-4xl">{{ $t("privacy") }}</h3>
     </div>
     <div class="flex flex-column col-7">
       <h1>Datenschutzerklärung</h1>

From cf23ed8ab3da49697b19cb2cbf8d1dc3665f7008 Mon Sep 17 00:00:00 2001
From: masterElmar <18119527+masterElmar@users.noreply.github.com>
Date: Mon, 20 Nov 2023 22:31:30 +0100
Subject: [PATCH 7/8] feat:#6 added attribute and schedule for feed clean

---
 .../migrations/1700512738_updated_feeds.go    |  52 ++
 .../1700512916_collections_snapshot.go        | 444 ++++++++++++++++++
 backend/model/feedModel.go                    |   8 +-
 backend/service/addSchedule.go                |  26 +-
 backend/service/db/dbFeeds.go                 |  25 +-
 5 files changed, 546 insertions(+), 9 deletions(-)
 create mode 100644 backend/migrations/1700512738_updated_feeds.go
 create mode 100644 backend/migrations/1700512916_collections_snapshot.go

diff --git a/backend/migrations/1700512738_updated_feeds.go b/backend/migrations/1700512738_updated_feeds.go
new file mode 100644
index 0000000..61ea0bc
--- /dev/null
+++ b/backend/migrations/1700512738_updated_feeds.go
@@ -0,0 +1,52 @@
+package migrations
+
+import (
+	"encoding/json"
+
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase/daos"
+	m "github.com/pocketbase/pocketbase/migrations"
+	"github.com/pocketbase/pocketbase/models/schema"
+)
+
+func init() {
+	m.Register(func(db dbx.Builder) error {
+		dao := daos.New(db)
+
+		collection, err := dao.FindCollectionByNameOrId("d65h4wh7zk13gxp")
+		if err != nil {
+			return err
+		}
+
+		// add
+		new_retrieved := &schema.SchemaField{}
+		json.Unmarshal([]byte(`{
+			"system": false,
+			"id": "wmmney8x",
+			"name": "retrieved",
+			"type": "date",
+			"required": false,
+			"presentable": false,
+			"unique": false,
+			"options": {
+				"min": "",
+				"max": ""
+			}
+		}`), new_retrieved)
+		collection.Schema.AddField(new_retrieved)
+
+		return dao.SaveCollection(collection)
+	}, func(db dbx.Builder) error {
+		dao := daos.New(db)
+
+		collection, err := dao.FindCollectionByNameOrId("d65h4wh7zk13gxp")
+		if err != nil {
+			return err
+		}
+
+		// remove
+		collection.Schema.RemoveField("wmmney8x")
+
+		return dao.SaveCollection(collection)
+	})
+}
diff --git a/backend/migrations/1700512916_collections_snapshot.go b/backend/migrations/1700512916_collections_snapshot.go
new file mode 100644
index 0000000..848483c
--- /dev/null
+++ b/backend/migrations/1700512916_collections_snapshot.go
@@ -0,0 +1,444 @@
+package migrations
+
+import (
+	"encoding/json"
+
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase/daos"
+	m "github.com/pocketbase/pocketbase/migrations"
+	"github.com/pocketbase/pocketbase/models"
+)
+
+func init() {
+	m.Register(func(db dbx.Builder) error {
+		jsonData := `[
+			{
+				"id": "cfq9mqlmd97v8z5",
+				"created": "2023-09-19 17:31:15.957Z",
+				"updated": "2023-11-01 21:17:43.567Z",
+				"name": "groups",
+				"type": "base",
+				"system": false,
+				"schema": [
+					{
+						"system": false,
+						"id": "85msl21p",
+						"name": "university",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "2sii4dtp",
+						"name": "shortcut",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "uiwgo28f",
+						"name": "groupId",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "y0l1lrzs",
+						"name": "course",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "kr62mhbz",
+						"name": "faculty",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "ya6znpez",
+						"name": "facultyId",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					}
+				],
+				"indexes": [
+					"CREATE UNIQUE INDEX ` + "`" + `idx_rcaN2Oq` + "`" + ` ON ` + "`" + `groups` + "`" + ` (` + "`" + `course` + "`" + `)"
+				],
+				"listRule": null,
+				"viewRule": null,
+				"createRule": null,
+				"updateRule": null,
+				"deleteRule": null,
+				"options": {}
+			},
+			{
+				"id": "d65h4wh7zk13gxp",
+				"created": "2023-09-19 17:31:15.957Z",
+				"updated": "2023-11-20 20:38:58.258Z",
+				"name": "feeds",
+				"type": "base",
+				"system": false,
+				"schema": [
+					{
+						"system": false,
+						"id": "cowxjfmc",
+						"name": "modules",
+						"type": "json",
+						"required": true,
+						"presentable": false,
+						"unique": false,
+						"options": {}
+					},
+					{
+						"system": false,
+						"id": "wmmney8x",
+						"name": "retrieved",
+						"type": "date",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": "",
+							"max": ""
+						}
+					}
+				],
+				"indexes": [],
+				"listRule": null,
+				"viewRule": "",
+				"createRule": null,
+				"updateRule": "",
+				"deleteRule": null,
+				"options": {}
+			},
+			{
+				"id": "7her4515qsmrxe8",
+				"created": "2023-09-19 17:31:15.958Z",
+				"updated": "2023-11-01 21:17:43.567Z",
+				"name": "events",
+				"type": "base",
+				"system": false,
+				"schema": [
+					{
+						"system": false,
+						"id": "m8ne8e3m",
+						"name": "Day",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "xnsxqp7j",
+						"name": "Week",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "aeuskrjo",
+						"name": "Name",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "klrzqyw0",
+						"name": "EventType",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "5zltexoy",
+						"name": "Prof",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "gy3nvfmx",
+						"name": "Rooms",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "hn7b8dfy",
+						"name": "Notes",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "axskpwm8",
+						"name": "BookedAt",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "vyyefxp7",
+						"name": "course",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "vlbpm9fz",
+						"name": "semester",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "0kahthzr",
+						"name": "uuid",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "6hkjwgb4",
+						"name": "start",
+						"type": "date",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": "",
+							"max": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "szbefpjf",
+						"name": "end",
+						"type": "date",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": "",
+							"max": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "nlnnxu7x",
+						"name": "Compulsory",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					}
+				],
+				"indexes": [
+					"CREATE INDEX ` + "`" + `idx_4vOTAiC` + "`" + ` ON ` + "`" + `events` + "`" + ` (\n  ` + "`" + `Name` + "`" + `,\n  ` + "`" + `course` + "`" + `,\n  ` + "`" + `start` + "`" + `,\n  ` + "`" + `end` + "`" + `,\n  ` + "`" + `semester` + "`" + `,\n  ` + "`" + `EventType` + "`" + `,\n  ` + "`" + `Compulsory` + "`" + `\n)"
+				],
+				"listRule": null,
+				"viewRule": null,
+				"createRule": null,
+				"updateRule": null,
+				"deleteRule": null,
+				"options": {}
+			},
+			{
+				"id": "_pb_users_auth_",
+				"created": "2023-11-01 21:17:43.390Z",
+				"updated": "2023-11-01 21:17:43.567Z",
+				"name": "users",
+				"type": "auth",
+				"system": false,
+				"schema": [
+					{
+						"system": false,
+						"id": "users_name",
+						"name": "name",
+						"type": "text",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"min": null,
+							"max": null,
+							"pattern": ""
+						}
+					},
+					{
+						"system": false,
+						"id": "users_avatar",
+						"name": "avatar",
+						"type": "file",
+						"required": false,
+						"presentable": false,
+						"unique": false,
+						"options": {
+							"maxSelect": 1,
+							"maxSize": 5242880,
+							"mimeTypes": [
+								"image/jpeg",
+								"image/png",
+								"image/svg+xml",
+								"image/gif",
+								"image/webp"
+							],
+							"thumbs": null,
+							"protected": false
+						}
+					}
+				],
+				"indexes": [],
+				"listRule": "id = @request.auth.id",
+				"viewRule": "id = @request.auth.id",
+				"createRule": "",
+				"updateRule": "id = @request.auth.id",
+				"deleteRule": "id = @request.auth.id",
+				"options": {
+					"allowEmailAuth": true,
+					"allowOAuth2Auth": true,
+					"allowUsernameAuth": true,
+					"exceptEmailDomains": null,
+					"manageRule": null,
+					"minPasswordLength": 8,
+					"onlyEmailDomains": null,
+					"requireEmail": false
+				}
+			}
+		]`
+
+		collections := []*models.Collection{}
+		if err := json.Unmarshal([]byte(jsonData), &collections); err != nil {
+			return err
+		}
+
+		return daos.New(db).ImportCollections(collections, true, nil)
+	}, func(db dbx.Builder) error {
+		return nil
+	})
+}
diff --git a/backend/model/feedModel.go b/backend/model/feedModel.go
index e3920a2..516ae8a 100644
--- a/backend/model/feedModel.go
+++ b/backend/model/feedModel.go
@@ -1,9 +1,13 @@
 package model
 
-import "github.com/pocketbase/pocketbase/models"
+import (
+	"github.com/pocketbase/pocketbase/models"
+	"time"
+)
 
 type Feed struct {
-	Modules string `db:"modules" json:"modules"`
+	Modules   string    `db:"modules" json:"modules"`
+	Retrieved time.Time `db:"retrieved" json:"retrieved"`
 	models.BaseModel
 }
 
diff --git a/backend/service/addSchedule.go b/backend/service/addSchedule.go
index 4cf41bc..280cb32 100644
--- a/backend/service/addSchedule.go
+++ b/backend/service/addSchedule.go
@@ -4,8 +4,10 @@ import (
 	"github.com/pocketbase/pocketbase"
 	"github.com/pocketbase/pocketbase/core"
 	"github.com/pocketbase/pocketbase/tools/cron"
+	"htwkalender/service/db"
 	"htwkalender/service/events"
 	"log"
+	"time"
 )
 
 func AddSchedules(app *pocketbase.PocketBase) {
@@ -17,9 +19,7 @@ func AddSchedules(app *pocketbase.PocketBase) {
 		// Every three hours update all courses (5 segments - minute, hour, day, month, weekday) "0 */3 * * *"
 		// Every 10 minutes update all courses (5 segments - minute, hour, day, month, weekday) "*/10 * * * *"
 		scheduler.MustAdd("updateCourse", "0 */3 * * *", func() {
-
 			courses := events.GetAllCourses(app)
-
 			for _, course := range courses {
 				err := events.UpdateModulesForCourse(app, course)
 				if err != nil {
@@ -29,11 +29,29 @@ func AddSchedules(app *pocketbase.PocketBase) {
 					log.Println("Update Course: " + course + " successful")
 				}
 			}
-
 		})
 
+		// Every sunday at 3am clean all courses (5 segments - minute, hour, day, month, weekday) "0 3 * * 0"
+		scheduler.MustAdd("cleanFeeds", "0 3 * * 0", func() {
+			feeds, err := db.GetAllFeeds(app)
+			if err != nil {
+				log.Println("CleanFeeds: get all feeds failed")
+				return
+			}
+			for _, feed := range feeds {
+				// if retrieved time is older than a half year delete feed
+				if feed.GetTime("retrieved").Before(time.Now().AddDate(0, -6, 0)) {
+					err = app.Dao().DeleteRecord(feed)
+					if err != nil {
+						log.Println("CleanFeeds: delete feed " + feed.GetId() + " failed")
+						log.Println(err)
+					} else {
+						log.Println("CleanFeeds: delete feed " + feed.GetId() + " successful")
+					}
+				}
+			}
+		})
 		scheduler.Start()
-
 		return nil
 	})
 
diff --git a/backend/service/db/dbFeeds.go b/backend/service/db/dbFeeds.go
index b8109a3..f2f0804 100644
--- a/backend/service/db/dbFeeds.go
+++ b/backend/service/db/dbFeeds.go
@@ -1,10 +1,10 @@
 package db
 
 import (
-	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase"
 	"github.com/pocketbase/pocketbase/models"
 	"htwkalender/model"
+	"time"
 )
 
 func SaveFeed(feed model.Feed, collection *models.Collection, app *pocketbase.PocketBase) (*models.Record, error) {
@@ -19,10 +19,29 @@ func SaveFeed(feed model.Feed, collection *models.Collection, app *pocketbase.Po
 }
 
 func FindFeedByToken(token string, app *pocketbase.PocketBase) (*model.Feed, error) {
-	var feed model.Feed
-	err := app.Dao().DB().Select("*").From("feeds").Where(dbx.NewExp("id = {:id}", dbx.Params{"id": token})).One(&feed)
+
+	record, err := app.Dao().FindRecordById("feeds", token)
+
 	if err != nil {
 		return nil, err
 	}
+
+	var feed model.Feed
+	feed.Modules = record.GetString("modules")
+	feed.Retrieved = record.GetTime("retrieved")
+
+	//update retrieved time
+	record.Set("retrieved", time.Now())
+
+	err = app.Dao().SaveRecord(record)
+
 	return &feed, err
 }
+
+func GetAllFeeds(app *pocketbase.PocketBase) ([]*models.Record, error) {
+	feeds, err := app.Dao().FindRecordsByFilter("feeds", "", "", 0, 0)
+	if err != nil {
+		return nil, err
+	}
+	return feeds, nil
+}

From f72610f2f9e1d977394f9046cd1ad96e77709f08 Mon Sep 17 00:00:00 2001
From: masterElmar <18119527+masterElmar@users.noreply.github.com>
Date: Tue, 21 Nov 2023 01:48:09 +0100
Subject: [PATCH 8/8] feat:#6 added tests with db for unused feed delete

---
 backend/model/feedModel.go                  |   6 +-
 backend/service/addSchedule.go              |  37 ++-------
 backend/service/course/courseFunctions.go   |  20 +++++
 backend/service/db/dbFeeds.go               |   8 +-
 backend/service/feed/feedFunctions.go       |  35 +++++++++
 backend/service/feed/feedFunctions_test.go  |  83 ++++++++++++++++++++
 backend/service/feed/mockData/data.db       | Bin 0 -> 143360 bytes
 backend/service/feed/mockData/logs.db       | Bin 0 -> 49152 bytes
 backend/service/functions/time/mockClock.go |  10 +++
 backend/service/functions/time/realClock.go |   8 ++
 backend/service/functions/time/time.go      |   8 ++
 11 files changed, 178 insertions(+), 37 deletions(-)
 create mode 100644 backend/service/course/courseFunctions.go
 create mode 100644 backend/service/feed/feedFunctions.go
 create mode 100644 backend/service/feed/feedFunctions_test.go
 create mode 100644 backend/service/feed/mockData/data.db
 create mode 100644 backend/service/feed/mockData/logs.db
 create mode 100644 backend/service/functions/time/mockClock.go
 create mode 100644 backend/service/functions/time/realClock.go
 create mode 100644 backend/service/functions/time/time.go

diff --git a/backend/model/feedModel.go b/backend/model/feedModel.go
index 516ae8a..cc2e413 100644
--- a/backend/model/feedModel.go
+++ b/backend/model/feedModel.go
@@ -2,12 +2,12 @@ package model
 
 import (
 	"github.com/pocketbase/pocketbase/models"
-	"time"
+	"github.com/pocketbase/pocketbase/tools/types"
 )
 
 type Feed struct {
-	Modules   string    `db:"modules" json:"modules"`
-	Retrieved time.Time `db:"retrieved" json:"retrieved"`
+	Modules   string         `db:"modules" json:"modules"`
+	Retrieved types.DateTime `db:"retrieved" json:"retrieved"`
 	models.BaseModel
 }
 
diff --git a/backend/service/addSchedule.go b/backend/service/addSchedule.go
index 280cb32..bd0cd96 100644
--- a/backend/service/addSchedule.go
+++ b/backend/service/addSchedule.go
@@ -4,10 +4,9 @@ import (
 	"github.com/pocketbase/pocketbase"
 	"github.com/pocketbase/pocketbase/core"
 	"github.com/pocketbase/pocketbase/tools/cron"
-	"htwkalender/service/db"
-	"htwkalender/service/events"
-	"log"
-	"time"
+	"htwkalender/service/course"
+	"htwkalender/service/feed"
+	"htwkalender/service/functions/time"
 )
 
 func AddSchedules(app *pocketbase.PocketBase) {
@@ -19,37 +18,13 @@ func AddSchedules(app *pocketbase.PocketBase) {
 		// Every three hours update all courses (5 segments - minute, hour, day, month, weekday) "0 */3 * * *"
 		// Every 10 minutes update all courses (5 segments - minute, hour, day, month, weekday) "*/10 * * * *"
 		scheduler.MustAdd("updateCourse", "0 */3 * * *", func() {
-			courses := events.GetAllCourses(app)
-			for _, course := range courses {
-				err := events.UpdateModulesForCourse(app, course)
-				if err != nil {
-					log.Println("Update Course: " + course + " failed")
-					log.Println(err)
-				} else {
-					log.Println("Update Course: " + course + " successful")
-				}
-			}
+			course.UpdateCourse(app)
 		})
 
 		// Every sunday at 3am clean all courses (5 segments - minute, hour, day, month, weekday) "0 3 * * 0"
 		scheduler.MustAdd("cleanFeeds", "0 3 * * 0", func() {
-			feeds, err := db.GetAllFeeds(app)
-			if err != nil {
-				log.Println("CleanFeeds: get all feeds failed")
-				return
-			}
-			for _, feed := range feeds {
-				// if retrieved time is older than a half year delete feed
-				if feed.GetTime("retrieved").Before(time.Now().AddDate(0, -6, 0)) {
-					err = app.Dao().DeleteRecord(feed)
-					if err != nil {
-						log.Println("CleanFeeds: delete feed " + feed.GetId() + " failed")
-						log.Println(err)
-					} else {
-						log.Println("CleanFeeds: delete feed " + feed.GetId() + " successful")
-					}
-				}
-			}
+			// clean feeds older than 6 months
+			feed.ClearFeeds(app.Dao(), 6, time.RealClock{})
 		})
 		scheduler.Start()
 		return nil
diff --git a/backend/service/course/courseFunctions.go b/backend/service/course/courseFunctions.go
new file mode 100644
index 0000000..0d24700
--- /dev/null
+++ b/backend/service/course/courseFunctions.go
@@ -0,0 +1,20 @@
+package course
+
+import (
+	"github.com/pocketbase/pocketbase"
+	"htwkalender/service/events"
+	"log"
+)
+
+func UpdateCourse(app *pocketbase.PocketBase) {
+	courses := events.GetAllCourses(app)
+	for _, course := range courses {
+		err := events.UpdateModulesForCourse(app, course)
+		if err != nil {
+			log.Println("Update Course: " + course + " failed")
+			log.Println(err)
+		} else {
+			log.Println("Update Course: " + course + " successful")
+		}
+	}
+}
diff --git a/backend/service/db/dbFeeds.go b/backend/service/db/dbFeeds.go
index f2f0804..408d763 100644
--- a/backend/service/db/dbFeeds.go
+++ b/backend/service/db/dbFeeds.go
@@ -2,6 +2,7 @@ package db
 
 import (
 	"github.com/pocketbase/pocketbase"
+	"github.com/pocketbase/pocketbase/daos"
 	"github.com/pocketbase/pocketbase/models"
 	"htwkalender/model"
 	"time"
@@ -28,7 +29,7 @@ func FindFeedByToken(token string, app *pocketbase.PocketBase) (*model.Feed, err
 
 	var feed model.Feed
 	feed.Modules = record.GetString("modules")
-	feed.Retrieved = record.GetTime("retrieved")
+	feed.Retrieved = record.GetDateTime("retrieved")
 
 	//update retrieved time
 	record.Set("retrieved", time.Now())
@@ -38,8 +39,9 @@ func FindFeedByToken(token string, app *pocketbase.PocketBase) (*model.Feed, err
 	return &feed, err
 }
 
-func GetAllFeeds(app *pocketbase.PocketBase) ([]*models.Record, error) {
-	feeds, err := app.Dao().FindRecordsByFilter("feeds", "", "", 0, 0)
+func GetAllFeeds(db *daos.Dao) ([]model.Feed, error) {
+	var feeds []model.Feed
+	err := db.DB().Select("*").From("feeds").All(&feeds)
 	if err != nil {
 		return nil, err
 	}
diff --git a/backend/service/feed/feedFunctions.go b/backend/service/feed/feedFunctions.go
new file mode 100644
index 0000000..853a144
--- /dev/null
+++ b/backend/service/feed/feedFunctions.go
@@ -0,0 +1,35 @@
+package feed
+
+import (
+	"github.com/pocketbase/dbx"
+	"github.com/pocketbase/pocketbase/daos"
+	database "htwkalender/service/db"
+	localTime "htwkalender/service/functions/time"
+	"log"
+)
+
+func ClearFeeds(db *daos.Dao, months int, clock localTime.Clock) {
+	feeds, err := database.GetAllFeeds(db)
+	if err != nil {
+		log.Println("CleanFeeds: get all feeds failed")
+		return
+	}
+	for _, feed := range feeds {
+		// if retrieved time is older than a half year delete feed
+		now := clock.Now()
+		feedRetrievedTime := feed.Retrieved.Time()
+		timeShift := now.AddDate(0, -months, 0)
+
+		if feedRetrievedTime.Before(timeShift) {
+			// delete feed
+			sqlResult, err := db.DB().Delete("feeds", dbx.NewExp("id = {:id}", dbx.Params{"id": feed.GetId()})).Execute()
+			if err != nil {
+				log.Println("CleanFeeds: delete feed " + feed.GetId() + " failed")
+				log.Println(err)
+				log.Println(sqlResult)
+			} else {
+				log.Println("CleanFeeds: delete feed " + feed.GetId() + " successful")
+			}
+		}
+	}
+}
diff --git a/backend/service/feed/feedFunctions_test.go b/backend/service/feed/feedFunctions_test.go
new file mode 100644
index 0000000..5eb1182
--- /dev/null
+++ b/backend/service/feed/feedFunctions_test.go
@@ -0,0 +1,83 @@
+package feed
+
+import (
+	"github.com/pocketbase/pocketbase/daos"
+	"github.com/pocketbase/pocketbase/tests"
+	"htwkalender/model"
+	mockTime "htwkalender/service/functions/time"
+	"testing"
+	"time"
+)
+
+const testDataDir = "./mockData"
+
+func TestClearFeeds(t *testing.T) {
+
+	setupTestApp := func(t *testing.T) *daos.Dao {
+		testApp, err := tests.NewTestApp(testDataDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+		dao := daos.New(testApp.Dao().DB())
+		return dao
+	}
+
+	type args struct {
+		db        *daos.Dao
+		months    int
+		mockClock mockTime.MockClock
+	}
+	testCases := []struct {
+		name string
+		args args
+		want int
+	}{
+		{
+			name: "TestClearFeeds",
+			args: args{
+				db:     setupTestApp(t),
+				months: 6,
+				mockClock: mockTime.MockClock{
+					NowTime: time.Date(2023, 12, 1, 0, 0, 0, 0, time.UTC),
+				},
+			},
+			want: 1,
+		},
+		{
+			name: "TestClearAllFeeds",
+			args: args{
+				db:     setupTestApp(t),
+				months: 1,
+				mockClock: mockTime.MockClock{
+					NowTime: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC),
+				},
+			},
+			want: 0,
+		},
+		{
+			name: "TestClearFeedsClearBeforeRetrievedTime",
+			args: args{
+				db:     setupTestApp(t),
+				months: 1,
+				mockClock: mockTime.MockClock{
+					NowTime: time.Date(2010, 1, 1, 0, 0, 0, 0, time.UTC),
+				},
+			},
+			want: 3,
+		},
+	}
+	for _, tt := range testCases {
+		t.Run(tt.name, func(t *testing.T) {
+			ClearFeeds(tt.args.db, tt.args.months, tt.args.mockClock)
+			// count all feeds in db
+			var feeds []*model.Feed
+			err := tt.args.db.DB().Select("id").From("feeds").All(&feeds)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if got := len(feeds); got != tt.want {
+				t.Errorf("ClearFeeds() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
diff --git a/backend/service/feed/mockData/data.db b/backend/service/feed/mockData/data.db
new file mode 100644
index 0000000000000000000000000000000000000000..acca65d300f16e4a1b6ca5af4e8a927b572656cb
GIT binary patch
literal 143360
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
HB?$a~;9Pf-

literal 0
HcmV?d00001

diff --git a/backend/service/feed/mockData/logs.db b/backend/service/feed/mockData/logs.db
new file mode 100644
index 0000000000000000000000000000000000000000..1391d969a4dd7a937aefbcf720e66083a039efe9
GIT binary patch
literal 49152
zcmeI5TWllM8OMD|;y8)t<g!^mpejSQ$*vn>&)6Q{Rw)~H!;<bMyX=O-B9J}tOzep-
zGoBg8PFPfB5mn)#V#Q05iV!cos6rJ|Us|dnDj~r`1$}4{s)U59R-!5o6%WwTN<A~<
zj6Guygdo@izS)h>Ie#C|%=yhX-<&yT?C<Km7X_6kH$=I@s$|SH>hgG8XGqfJa(VIJ
z2>#n!hH<8EuYgl`N8Tyxb%i(I3=IF!<sU4%(6`YmgGDqva&GwVL;odyOvIc%209P`
z0zd!=00AKIRUq*AnAaDansPr;Q`z-0pOyJqomW)F%=DeTvb4CiM6NB~b#aNznR<>q
zHRQ)jPT+E6Ygt=*V2!+dWqD=s$~E%B(lv7R(i*vX-^Gh}7**?Xd9SWs_1x0ki}zhz
zBd4eBH7mSY6pa;IYZiF5tFof9YF*LSyu7-$bbjdyxwqyhMcG%)*41KbFKnyU8g5_t
zw9HpTm0y;oTWut*AEKklFoplo_7CP{euI~JS=*HLBV9G?3NJ4f_^O)ww3-+T+uHZ<
zT)nhvHgo!sN4wUVmw8s@b%vJhpHftLLlr9gsgpC;=4UGNGaNZ{PiAH%GqdsF$xz77
zt1fY$Z#~+vzk|$atz4GuP3*xhw2KCP!8@niyDLJK<C}XXmu<BuTNLYZR^ZGx6o1P`
zmsig%JwQ6vC&jAOfP0gms0>A&#CyC)Fccd3x$A+sDR<4fKZ0c0i^1M|Vbto{c21CT
zp@#+rf{`irwspOlg<96^>%Hc^dfn^RZ9J6k_XT4ZquaWA<8-lXV4(K~+BLg3(K_iu
z=p*-&x&sM-1L@^JwBw9jfWBDH!|5KT-|~|Oa~*{tUy#9v+h;x8+Ig3?nd*?`c$-c=
z+fg@1V*g^kgT3piy)!se@%w^lydh-Wkl`uqo3fr2<_hsis`=Gc?H(K3^Sika-8T?i
znsU4JttquKzAw&V0~d|0@15;RmNv8fyDqmcc;bY6_q<`06`>%rsvuUCY&+{|LD;*p
zwco*w-4Mz=`Q61UXYX0Oaw^I&q2AXul9i;gz;oo@g=g=I7h*gE!Q~T<d)?j`-tTrn
zySE?I`V|5E=S4qop?A@*Z~_Yu00KY&2mk>f00e*l5C8%|00;m9An*ke_?FjuVSr8~
zlgR`XO{TMTNy6hPc~;@G#u#<DAi4&Ip8eS`-M^Xhcvo=U1eJ=?G!@IT9A}QG<i&Em
zQthbx4Y!xZmE%-8m7*vrD^vxw<Lx2bCNFy4h5mtF#R)7x00;m9AOHk_01yBIKmZ5;
z0U!VbfWWOFaKd}R{VC%D-fwzWaGg&c5AaNSX@B=PKtFDi8-1*`Yy^EgygGDx@FU-!
z2cGV)^(}hGJmao6ZbhRHyv-YD0%&fRpYQ~y7Ix>y78a(MZLW|kM7PAEsBBl_5mpi+
zc#x#b=k@0_B3yzg#v8@tPKk~cno>mO^P<ctcS>x5U!Z3tUcRj5;?%4n%Id;=>tU@~
zr6fpeqRN(WCHxSF%F7G0d{bhp+yXB1WlmW*zqIChjpZsr)qDh}sH##X5;4n}6qTkT
z*~p5xBb3W*gb7pRsr&I0Ct^b(SJy}yKl68*#6lu|nrvz>@>YhX(qSq@p6Bx=F%qR{
z3je3cy9N9>kJyaRG=BGyN263UHc!*@QHqSlGITN%i-x0A`avh%+@;;?BgEXplWl_a
z`c|~L(@>czRg0&i`z3h!($z!P{HR0oqYs+RzcD}DZoYyIsF7qh#WXe<F}@M6?|hc#
zyPvv6M}L}^Wl>(?6$RVwbY{9Da`iH=WXKgkQG{xN)E>XZ_QH`{Y`M;dr@PICj)xNr
z)6J`;ckmjr^4h2<Vyu`hsT+-TF;0D5cv10iIze~yYUyoWQ-18BPIP!Ex|rWwS5h%K
zT8cH8<bHwKJyhEbwcL-u9VQ2q$i%T<O2_PkOubF$%%IJOH=;_NNp5b|L^&^~)q@f`
z>OQ=Ms>_L)dK=-C&t_!X%|^9GZ*di=5lxEqE`(WWU7tfxv_~F`S*Oe3;Wx4*zRD$g
z7@48B37r|R85zegY;!9u#nLR5NK_9>=qq4k8mfc?!bHcFa<m^K?C<boWxkN8@S+&6
za*1+t(~i*YvGA8BEZr!*gEbSqtIAgRL*}}YVLII#iKd%YwVUfB=1z7HX>M+DB1h5q
zix3RYF**^2S5<rsRt{eiQ}LchoyK~*iL#fNTkhx{@>NQtV$n@iO>GENT5qD>?NK6{
zE17Qy_(ftBrGfj^MyIf#J-}|R@s{<8vERhUHPv;|Hg$6sAM<!d+ory&bqix9l}VPP
zd_7sLHMSC;)7ITLZxIutr+5y3-$y7bxTp9~ouXp-s!-N5{PZ36uH;&g*L#on2=4VF
z6|EO3aHM|JN$sGEvaq8+2T!VEiLc^Ua-Ao!;dl2mG3<Ca$@H>3LpKk?jVo?so?QAd
zNY+GVtI6;(Q!1qkMf=(Hb%z@3)l<Mwv93YIH`&7hZT>$<FfQV8v_dfGZQ=#uf5b9+
zpQxcH(5uA5#4{+3o+Vx({)EO5i)PS^#CxcI;QMp<AP@ioKmZ5;0U!VbfB+Bx0zd!=
z93=u1-Z^({vq6{HosD=ZwN96|f|`~PV~W}=#y2;(W<9ZWT+?{5K=XOF+$`qn9M4Q@
zT5_A)PDp9Cl!_-9N;sxzG*=Z%B{^SYnpI_^F`<99(NxRjt@U)d$}#2IxTeLocZy6t
zUZU!?O`dL!X<B((k?3fxxh}+NsR}i!X|k}rnPw9l-zZD<w1PBkTi$AJm6U=cMbkUg
z1fglR`Qd=3*=9UPG|e^*IIL;5sjeYSv(4uC_0L-8F9tQuHX!fQG}{pLfTr2TRQol}
zHmcaCX|`cFucq0?s66A|IlpbpM8E$>IT!jT`Wt!&y@lRHucP0i7tl}8bLdCtCVCP*
zhOVPJs-gnQp_lNl1pEhmaFmP{_7w;K0U!VbfB+Bx0zd!=00AHX1c1O7Phi07al2j%
z8p&}ZnKY7PMlxX}<3=)OB%?-xjD#?ffRT)7iTkNxBN;M8zmW_YiO)y|jHKU4`i#V@
zCGMM^ey_*xzG>Y5-{wMZqc`v`0K9}=L_bB(qNnlf|M&1+e+kd|-;Y+%S^N}01ke88
zhCW2^qrZOf++Yhp00;m9AOHk_01yBIKmZ5;0U!Vbz9a&EZ_urOr6FkMj+?njGk46)
zO_;fHGdE`DM$H^DbA*`-n7I)%H*DsH%$(oM4VpQhnHw;3{bsID%jw@P@tQf$pf~8(
zHRJjJmtE)sJpca|p8J0Z&;37#=lvhUcmD-+4P8JB_|E@!G=chw4~h4PzYu>QUjCAf
z0Bi;b00AHX1b_e#00KY&2mk>f00e-5K_K9ra+^O85VVwzTS}9b(lJYE!crQyl*TNj
zQA-I~N`$2pu#`qDrD02H$WroKN`sb?&r%w&l=>~DK1<1KDS1Y`Q+|_~e*YhM+lAgk
ze?-4V&*ORj8oujaL?JXr{F``}c%68Wc!t;|1ma#IP25iS1OLL+VF3a_00;m9AOHk_
z01yBIKmZ5;fx|)|=#9C}-}<IWipuE!gAV#}2Yu2(KjxrMIOyXRUH?sTeSgLr^ic;L
zIp~Cg9&pe{9Q0uaeaJ!gJLrQBy3au$aM1f5^gajO>!5p%dt-jn9@_k2{{OI?u&^IM
z00;m9AOHk_01yBIKmZ5;0U+=R1S~V#F#nH#)gK3p3)B0b{|{ie0UYFy_(foLgogNk
zPJxe(dRQNb|EGmN><Wm{!UFOCtV4r1TqMN*`)u(NA^zVd2Ow<)se|}`2an;}LfGZR
zOx=8{?*_#GvqZnegdqOk{sINJQ1uRWr^N+q8yUp^)8fZL{6C2Q2l4+P{$EG%^+OU=
z@l)de=_3W&{r^zkZ(Yb8_}$3M!`FwN@qd5ttnc>zcd!Tx5C8%|;E)oyF%`5$IkyF+
zu?OXia0#XuZxoX|B|27UN=}1)hc?Q&@f=?)L#M;>SjVljO>cM6&m6Z!Ik$!AIVho{
zI~;05WsZB<^ftn&Nt=<`A{uoe%u4Ioy28s!RttrkJ-SAg3diE<c0_QKkfFB;ojGPR
zGFyD7gA)1*7@3AD>3}fVc`H4E5%zZkj<<!wvLn1xVhj8NJuC6@Wi1z_s9B{XNNb|X
zma(pgvbr!6y{pPr_`?xrzQcN=R4><+!sGL?Hj>@kIAKQn9>W3Gd228*od}L7t_szH
za_E|9i7MaGbWQI#amH*XjxD&E{iyHv`gL?q9R0y$I+dZ);Y6at_t<n3;qLWOV(#Hd
zPjG5scV4p+TPV2w61;rr>YD2{{ny^ibr)4t%0wb&Ig_H&R3sZ&5qE@gnT;@Eiad3{
zQ02siLawfnG`^uaO=2N|hj^RXi@cSgaZ9KWd7jUg#7K01LvXF;cbp`a=69SVH_jlN
z1=+&h?YI4Qe{$3<D4B^z!%QsIcD)8dQ#X(5?sdXyLAD@)`z3g&EU48?+M)R!KIs3=
CG*PVp

literal 0
HcmV?d00001

diff --git a/backend/service/functions/time/mockClock.go b/backend/service/functions/time/mockClock.go
new file mode 100644
index 0000000..a81ab04
--- /dev/null
+++ b/backend/service/functions/time/mockClock.go
@@ -0,0 +1,10 @@
+package time
+
+import "time"
+
+type MockClock struct {
+	NowTime time.Time
+}
+
+func (m MockClock) Now() time.Time                       { return m.NowTime }
+func (MockClock) After(d time.Duration) <-chan time.Time { return time.After(d) }
diff --git a/backend/service/functions/time/realClock.go b/backend/service/functions/time/realClock.go
new file mode 100644
index 0000000..290b298
--- /dev/null
+++ b/backend/service/functions/time/realClock.go
@@ -0,0 +1,8 @@
+package time
+
+import "time"
+
+type RealClock struct{}
+
+func (RealClock) Now() time.Time                         { return time.Now() }
+func (RealClock) After(d time.Duration) <-chan time.Time { return time.After(d) }
diff --git a/backend/service/functions/time/time.go b/backend/service/functions/time/time.go
new file mode 100644
index 0000000..bc58b8e
--- /dev/null
+++ b/backend/service/functions/time/time.go
@@ -0,0 +1,8 @@
+package time
+
+import "time"
+
+type Clock interface {
+	Now() time.Time
+	After(d time.Duration) <-chan time.Time
+}