From 4c5d132de809926b4d629bdfd0c12651d8af072b Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Wed, 29 Jan 2025 08:53:42 +0100
Subject: [PATCH] change user to uuid

---
 src/components/Pagination.vue                 | 21 +++---
 src/components/admin/MemberSearchSelect.vue   |  6 +-
 src/components/admin/Permission.vue           |  4 +-
 src/stores/admin/club/member/member.ts        |  8 +--
 .../club/newsletter/newsletterRecipients.ts   |  4 +-
 .../admin/club/protocol/protocolPresence.ts   |  4 +-
 src/stores/admin/user/user.ts                 | 66 ++++++++-----------
 .../admin/club/member/member.models.ts        |  6 +-
 .../newsletter/newsletterRecipients.models.ts |  4 +-
 .../club/protocol/protocolPresence.models.ts  |  4 +-
 src/viewmodels/admin/user/user.models.ts      |  4 +-
 .../club/newsletter/NewsletterRecipients.vue  |  2 +-
 .../admin/club/protocol/ProtocolPresence.vue  |  6 +-
 src/views/admin/user/user/UserEdit.vue        |  2 +-
 .../admin/user/user/UserEditPermission.vue    |  2 +-
 src/views/admin/user/user/UserEditRoles.vue   |  2 +-
 src/views/docs/DocPage.vue                    | 34 +++++-----
 17 files changed, 86 insertions(+), 93 deletions(-)

diff --git a/src/components/Pagination.vue b/src/components/Pagination.vue
index 28084c6..83210a7 100644
--- a/src/components/Pagination.vue
+++ b/src/components/Pagination.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="grow flex flex-col gap-2 overflow-hidden">
     <div v-if="useSearch" class="relative self-end flex flex-row items-center gap-2">
-      <Spinner v-if="deferingSearch"  />
+      <Spinner v-if="deferingSearch" />
       <input
         type="text"
         class="!max-w-64 !w-64 rounded-md shadow-sm relative block px-3 py-2 pr-5 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-b-md focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
@@ -82,27 +82,30 @@ const props = defineProps({
 });
 
 const slots = defineSlots<{
-  pageRow(props: { row: T }): void;
+  pageRow(props: { row: T; key: number }): void;
 }>();
 
 const timer = ref(undefined) as undefined | any;
 const currentPage = ref(0);
 const searchString = ref("");
-const deferingSearch = ref(false)
+const deferingSearch = ref(false);
 
 watch(searchString, async () => {
-  deferingSearch.value = true
+  deferingSearch.value = true;
   clearTimeout(timer.value);
   timer.value = setTimeout(() => {
     currentPage.value = 0;
-    deferingSearch.value = false
+    deferingSearch.value = false;
     emit("search", searchString.value);
   }, 600);
 });
 
-watch(() => props.totalCount, async () => {
-  currentPage.value = 0;
-});
+watch(
+  () => props.totalCount,
+  async () => {
+    currentPage.value = 0;
+  }
+);
 
 const emit = defineEmits({
   submit(id: number) {
@@ -159,7 +162,7 @@ const loadPage = (newPage: number | ".") => {
   if (pageEnd > entryCount.value) pageEnd = entryCount.value;
 
   let loadedElementCount = filterData(props.items, searchString.value, pageStart, pageEnd).length;
-  
+
   if (loadedElementCount < props.maxEntriesPerPage && (pageEnd != props.totalCount || loadedElementCount == 0))
     emit("loadData", pageStart, props.maxEntriesPerPage, searchString.value);
 
diff --git a/src/components/admin/MemberSearchSelect.vue b/src/components/admin/MemberSearchSelect.vue
index cf67fa9..1522d31 100644
--- a/src/components/admin/MemberSearchSelect.vue
+++ b/src/components/admin/MemberSearchSelect.vue
@@ -93,7 +93,7 @@ import Spinner from "../Spinner.vue";
 export default defineComponent({
   props: {
     modelValue: {
-      type: Array as PropType<Array<number>>,
+      type: Array as PropType<Array<string>>,
       default: [],
     },
     title: String,
@@ -133,7 +133,7 @@ export default defineComponent({
       get() {
         return this.modelValue;
       },
-      set(val: Array<number>) {
+      set(val: Array<string>) {
         this.$emit("update:model-value", val);
         if (this.modelValue.length < val.length) {
           let diff = difference(val, this.modelValue);
@@ -166,7 +166,7 @@ export default defineComponent({
           this.loading = false;
         });
     },
-    getMemberFromSearch(id: number) {
+    getMemberFromSearch(id: string) {
       return this.filtered.find((f) => f.id == id);
     },
     loadMembersInitial() {
diff --git a/src/components/admin/Permission.vue b/src/components/admin/Permission.vue
index 93dcd2a..31b1060 100644
--- a/src/components/admin/Permission.vue
+++ b/src/components/admin/Permission.vue
@@ -178,12 +178,12 @@ export default defineComponent({
         if (!this.permissionUpdate[section]) {
           this.permissionUpdate[section] = {};
         }
-        this.permissionUpdate[section].all = permissions;
+        this.permissionUpdate[section]!.all = permissions;
       } else {
         if (!this.permissionUpdate[section]) {
           this.permissionUpdate[section] = {};
         }
-        this.permissionUpdate[section][modul] = permissions;
+        this.permissionUpdate[section]![modul] = permissions;
       }
     },
     reset() {
diff --git a/src/stores/admin/club/member/member.ts b/src/stores/admin/club/member/member.ts
index d92670e..29fc075 100644
--- a/src/stores/admin/club/member/member.ts
+++ b/src/stores/admin/club/member/member.ts
@@ -14,7 +14,7 @@ export const useMemberStore = defineStore("member", {
       members: [] as Array<MemberViewModel & { tab_pos: number }>,
       totalCount: 0 as number,
       loading: "loading" as "loading" | "fetched" | "failed",
-      activeMember: null as number | null,
+      activeMember: null as string | null,
       activeMemberObj: null as MemberViewModel | null,
       activeMemberStatistics: null as MemberStatisticsViewModel | null,
       loadingActive: "loading" as "loading" | "fetched" | "failed",
@@ -50,7 +50,7 @@ export const useMemberStore = defineStore("member", {
         return { ...res, data: res.data.members };
       });
     },
-    async getMembersByIds(ids: Array<number>): Promise<AxiosResponse<any, any>> {
+    async getMembersByIds(ids: Array<string>): Promise<AxiosResponse<any, any>> {
       return await http.get(`/admin/member?ids=${ids.join(",")}&noLimit=true`).then((res) => {
         return { ...res, data: res.data.members };
       });
@@ -72,7 +72,7 @@ export const useMemberStore = defineStore("member", {
           this.loadingActive = "failed";
         });
     },
-    fetchMemberById(id: number) {
+    fetchMemberById(id: string) {
       return http.get(`/admin/member/${id}`);
     },
     fetchMemberStatisticsByActiveId() {
@@ -83,7 +83,7 @@ export const useMemberStore = defineStore("member", {
         })
         .catch((err) => {});
     },
-    fetchMemberStatisticsById(id: number) {
+    fetchMemberStatisticsById(id: string) {
       return http.get(`/admin/member/${id}/statistics`);
     },
     async createMember(member: CreateMemberViewModel): Promise<AxiosResponse<any, any>> {
diff --git a/src/stores/admin/club/newsletter/newsletterRecipients.ts b/src/stores/admin/club/newsletter/newsletterRecipients.ts
index 594ac7f..2a7efb3 100644
--- a/src/stores/admin/club/newsletter/newsletterRecipients.ts
+++ b/src/stores/admin/club/newsletter/newsletterRecipients.ts
@@ -12,8 +12,8 @@ export const useNewsletterRecipientsStore = defineStore("newsletterRecipients",
   state: () => {
     return {
       initialized: false as boolean,
-      recipients: [] as Array<number>,
-      origin: [] as Array<number>,
+      recipients: [] as Array<string>,
+      origin: [] as Array<string>,
       loading: "loading" as "loading" | "fetched" | "failed",
       syncingNewsletterRecipients: "synced" as "synced" | "syncing" | "detectedChanges" | "failed",
     };
diff --git a/src/stores/admin/club/protocol/protocolPresence.ts b/src/stores/admin/club/protocol/protocolPresence.ts
index de641d2..b2f6c9c 100644
--- a/src/stores/admin/club/protocol/protocolPresence.ts
+++ b/src/stores/admin/club/protocol/protocolPresence.ts
@@ -22,8 +22,8 @@ export const useProtocolPresenceStore = defineStore("protocolPresence", {
   getters: {
     detectedChangeProtocolPresence: (state) =>
       !isEqual(
-        state.origin.sort((a: ProtocolPresenceViewModel, b: ProtocolPresenceViewModel) => a.memberId - b.memberId),
-        state.presence.sort((a: ProtocolPresenceViewModel, b: ProtocolPresenceViewModel) => a.memberId - b.memberId)
+        state.origin, //.sort((a: ProtocolPresenceViewModel, b: ProtocolPresenceViewModel) => a.memberId - b.memberId),
+        state.presence //.sort((a: ProtocolPresenceViewModel, b: ProtocolPresenceViewModel) => a.memberId - b.memberId)
       ) && state.syncingProtocolPresence != "syncing",
   },
   actions: {
diff --git a/src/stores/admin/user/user.ts b/src/stores/admin/user/user.ts
index 5696063..dc8ee25 100644
--- a/src/stores/admin/user/user.ts
+++ b/src/stores/admin/user/user.ts
@@ -24,47 +24,37 @@ export const useUserStore = defineStore("user", {
           this.loading = "failed";
         });
     },
-    fetchUserById(id: number): Promise<AxiosResponse<any, any>> {
+    fetchUserById(id: string): Promise<AxiosResponse<any, any>> {
       return http.get(`/admin/user/${id}`);
     },
-    updateActiveUser(user: UpdateUserViewModel): Promise<AxiosResponse<any, any>> {
-      return http
-        .patch(`/admin/user/${user.id}`, {
-          username: user.username,
-          firstname: user.firstname,
-          lastname: user.lastname,
-          mail: user.mail,
-        })
-        .then((result) => {
-          this.fetchUsers();
-          return result;
-        });
-    },
-    updateActiveUserPermissions(user: number, permission: PermissionObject): Promise<AxiosResponse<any, any>> {
-      return http
-        .patch(`/admin/user/${user}/permissions`, {
-          permissions: permission,
-        })
-        .then((result) => {
-          this.fetchUsers();
-          return result;
-        });
-    },
-    updateActiveUserRoles(user: number, roles: Array<number>): Promise<AxiosResponse<any, any>> {
-      return http
-        .patch(`/admin/user/${user}/roles`, {
-          roleIds: roles,
-        })
-        .then((result) => {
-          this.fetchUsers();
-          return result;
-        });
-    },
-    deleteUser(user: number): Promise<AxiosResponse<any, any>> {
-      return http.delete(`/admin/user/${user}`).then((result) => {
-        this.fetchUsers();
-        return result;
+    async updateActiveUser(user: UpdateUserViewModel): Promise<AxiosResponse<any, any>> {
+      const result = await http.patch(`/admin/user/${user.id}`, {
+        username: user.username,
+        firstname: user.firstname,
+        lastname: user.lastname,
+        mail: user.mail,
       });
+      this.fetchUsers();
+      return result;
+    },
+    async updateActiveUserPermissions(userId: string, permission: PermissionObject): Promise<AxiosResponse<any, any>> {
+      const result = await http.patch(`/admin/user/${userId}/permissions`, {
+        permissions: permission,
+      });
+      this.fetchUsers();
+      return result;
+    },
+    async updateActiveUserRoles(userId: string, roles: Array<number>): Promise<AxiosResponse<any, any>> {
+      const result = await http.patch(`/admin/user/${userId}/roles`, {
+        roleIds: roles,
+      });
+      this.fetchUsers();
+      return result;
+    },
+    async deleteUser(userId: string): Promise<AxiosResponse<any, any>> {
+      const result = await http.delete(`/admin/user/${userId}`);
+      this.fetchUsers();
+      return result;
     },
   },
 });
diff --git a/src/viewmodels/admin/club/member/member.models.ts b/src/viewmodels/admin/club/member/member.models.ts
index a6b49ff..e367e4a 100644
--- a/src/viewmodels/admin/club/member/member.models.ts
+++ b/src/viewmodels/admin/club/member/member.models.ts
@@ -3,7 +3,7 @@ import type { MembershipViewModel } from "./membership.models";
 import type { SalutationViewModel } from "../../settings/salutation.models";
 
 export interface MemberViewModel {
-  id: number;
+  id: string;
   salutation: SalutationViewModel;
   firstname: string;
   lastname: string;
@@ -18,7 +18,7 @@ export interface MemberViewModel {
 }
 
 export interface MemberStatisticsViewModel {
-  id: number;
+  id: string;
   salutation: string;
   firstname: string;
   lastname: string;
@@ -39,7 +39,7 @@ export interface CreateMemberViewModel {
 }
 
 export interface UpdateMemberViewModel {
-  id: number;
+  id: string;
   salutationId: number;
   firstname: string;
   lastname: string;
diff --git a/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts b/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
index 7e5ab15..b78192c 100644
--- a/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
+++ b/src/viewmodels/admin/club/newsletter/newsletterRecipients.models.ts
@@ -2,10 +2,10 @@ import type { MemberViewModel } from "../member/member.models";
 
 export interface NewsletterRecipientsViewModel {
   newsletterId: number;
-  memberId: number;
+  memberId: string;
   member: MemberViewModel;
 }
 
 export interface SyncNewsletterRecipientsViewModel {
-  memberId: number;
+  memberId: string;
 }
diff --git a/src/viewmodels/admin/club/protocol/protocolPresence.models.ts b/src/viewmodels/admin/club/protocol/protocolPresence.models.ts
index 35bdd44..755261b 100644
--- a/src/viewmodels/admin/club/protocol/protocolPresence.models.ts
+++ b/src/viewmodels/admin/club/protocol/protocolPresence.models.ts
@@ -1,10 +1,10 @@
 export interface ProtocolPresenceViewModel {
-  memberId: number;
+  memberId: string;
   absent: boolean;
   excused: boolean;
   protocolId: number;
 }
 
 export interface SyncProtocolPresenceViewModel {
-  memberIds: Array<number>;
+  memberIds: Array<string>;
 }
diff --git a/src/viewmodels/admin/user/user.models.ts b/src/viewmodels/admin/user/user.models.ts
index 94cc940..d13b38a 100644
--- a/src/viewmodels/admin/user/user.models.ts
+++ b/src/viewmodels/admin/user/user.models.ts
@@ -2,7 +2,7 @@ import type { PermissionObject } from "@/types/permissionTypes";
 import type { RoleViewModel } from "./role.models";
 
 export interface UserViewModel {
-  id: number;
+  id: string;
   username: string;
   mail: string;
   firstname: string;
@@ -21,7 +21,7 @@ export interface CreateUserViewModel {
 }
 
 export interface UpdateUserViewModel {
-  id: number;
+  id: string;
   username: string;
   mail: string;
   firstname: string;
diff --git a/src/views/admin/club/newsletter/NewsletterRecipients.vue b/src/views/admin/club/newsletter/NewsletterRecipients.vue
index 0a18c1a..e1b2d96 100644
--- a/src/views/admin/club/newsletter/NewsletterRecipients.vue
+++ b/src/views/admin/club/newsletter/NewsletterRecipients.vue
@@ -154,7 +154,7 @@ export default defineComponent({
     ...mapActions(useNewsletterRecipientsStore, ["fetchNewsletterRecipients"]),
     ...mapActions(useQueryStoreStore, ["fetchQueries"]),
     ...mapActions(useQueryBuilderStore, ["sendQuery"]),
-    removeSelected(id: number) {
+    removeSelected(id: string) {
       let index = this.recipients.findIndex((s) => s == id);
       if (index != -1) {
         this.recipients.splice(index, 1);
diff --git a/src/views/admin/club/protocol/ProtocolPresence.vue b/src/views/admin/club/protocol/ProtocolPresence.vue
index e5f2c19..c392338 100644
--- a/src/views/admin/club/protocol/ProtocolPresence.vue
+++ b/src/views/admin/club/protocol/ProtocolPresence.vue
@@ -10,7 +10,7 @@
       :model-value="presence.map((p) => p.memberId)"
       :disabled="!can('create', 'club', 'protocol')"
       @add:difference="
-        (id: number) =>
+        (id: string) =>
           presence.push({ memberId: id, absent: false, excused: true, protocolId: parseInt(protocolId ?? '') })
       "
       @add:member="(s) => members.push(s)"
@@ -78,7 +78,7 @@ export default defineComponent({
     ...mapWritableState(useProtocolPresenceStore, ["presence", "loading"]),
     ...mapState(useAbilityStore, ["can"]),
     getMember() {
-      return (memberId: number) => {
+      return (memberId: string) => {
         return this.members.find((m) => memberId == m.id);
       };
     },
@@ -86,7 +86,7 @@ export default defineComponent({
   mounted() {},
   methods: {
     ...mapActions(useProtocolPresenceStore, ["fetchProtocolPresence"]),
-    removeSelected(id: number) {
+    removeSelected(id: string) {
       let index = this.presence.findIndex((s) => s.memberId == id);
       if (index != -1) {
         this.presence.splice(index, 1);
diff --git a/src/views/admin/user/user/UserEdit.vue b/src/views/admin/user/user/UserEdit.vue
index 154b3f3..05e4898 100644
--- a/src/views/admin/user/user/UserEdit.vue
+++ b/src/views/admin/user/user/UserEdit.vue
@@ -95,7 +95,7 @@ export default defineComponent({
       this.user = cloneDeep(this.origin);
     },
     fetchItem() {
-      this.fetchUserById(parseInt(this.id ?? ""))
+      this.fetchUserById(this.id ?? "")
         .then((result) => {
           this.user = result.data;
           this.origin = cloneDeep(result.data);
diff --git a/src/views/admin/user/user/UserEditPermission.vue b/src/views/admin/user/user/UserEditPermission.vue
index 748cc18..b34dd62 100644
--- a/src/views/admin/user/user/UserEditPermission.vue
+++ b/src/views/admin/user/user/UserEditPermission.vue
@@ -57,7 +57,7 @@ export default defineComponent({
   methods: {
     ...mapActions(useUserStore, ["fetchUserById", "updateActiveUserPermissions"]),
     fetchItem() {
-      this.fetchUserById(parseInt(this.id ?? ""))
+      this.fetchUserById(this.id ?? "")
         .then((result) => {
           this.user = result.data;
           this.loading = "fetched";
diff --git a/src/views/admin/user/user/UserEditRoles.vue b/src/views/admin/user/user/UserEditRoles.vue
index e162ab1..45ff118 100644
--- a/src/views/admin/user/user/UserEditRoles.vue
+++ b/src/views/admin/user/user/UserEditRoles.vue
@@ -111,7 +111,7 @@ export default defineComponent({
       this.assigned = this.origin?.roles.map((r) => r.id) ?? [];
     },
     fetchItem() {
-      this.fetchUserById(parseInt(this.id ?? ""))
+      this.fetchUserById(this.id ?? "")
         .then((result) => {
           this.origin = cloneDeep(result.data);
           this.assigned = this.origin?.roles.map((r) => r.id) ?? [];
diff --git a/src/views/docs/DocPage.vue b/src/views/docs/DocPage.vue
index 6d58af9..483a7fe 100644
--- a/src/views/docs/DocPage.vue
+++ b/src/views/docs/DocPage.vue
@@ -11,53 +11,53 @@
           <component v-if="markdownComponent" :is="markdownComponent" />
           <p v-else>Diese Seite existiert nicht.</p>
         </div>
-      </div>      
+      </div>
     </template>
   </MainTemplate>
 </template>
 
 <script setup lang="ts">
-import { defineAsyncComponent, defineComponent, markRaw} from "vue";
+import { defineAsyncComponent, defineComponent, markRaw } from "vue";
 import MainTemplate from "@/templates/Main.vue";
-import 'highlight.js/styles/atom-one-dark.css';
+import "highlight.js/styles/atom-one-dark.css";
 </script>
 
 <script lang="ts">
 export default defineComponent({
   props: {
-    page: String
+    page: String,
   },
-  watch:{
+  watch: {
     page() {
-      this.loadPage()
-    }
+      this.loadPage();
+    },
   },
   data() {
     return {
-      markdownComponent: null,
+      markdownComponent: null as any,
     };
   },
   async mounted() {
-    this.loadPage()
+    this.loadPage();
   },
-  methods:{
-    loadPage(){
-      this.markdownComponent = null
+  methods: {
+    loadPage() {
+      this.markdownComponent = null;
       this.markdownComponent = markRaw(defineAsyncComponent(() => import(`$/${this.page?.toLowerCase()}.md`)));
-    }
-  }
+    },
+  },
 });
 </script>
 
 <style>
 .markdown-container {
-  font-family: 'Open Sans', sans-serif;
+  font-family: "Open Sans", sans-serif;
   color: #555;
   background-color: #f8f8f8;
   border: 2px solid gray;
   padding: 20px;
   border-radius: 5px;
-  height: 100%
+  height: 100%;
 }
 
 .markdown-container h1 {
@@ -84,4 +84,4 @@ export default defineComponent({
   list-style-type: disc;
   margin-left: 20px;
 }
-</style>
\ No newline at end of file
+</style>