From 8aadd146b8bd1e69a13c922decead6f59c880b5d Mon Sep 17 00:00:00 2001
From: Chneemann <Andre-Ke@gmx.de>
Date: Sat, 30 Mar 2024 10:30:29 +0100
Subject: [PATCH] clean code

---
 .../components/board/task/task.component.html    |  6 +++++-
 .../components/board/task/task.component.scss    |  1 -
 src/app/components/board/task/task.component.ts  | 16 +++++++++++++++-
 .../components/contacts/contacts.component.ts    |  4 +++-
 src/app/services/user.service.ts                 | 13 ++++++-------
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/app/components/board/task/task.component.html b/src/app/components/board/task/task.component.html
index b5fc2f7..9821825 100644
--- a/src/app/components/board/task/task.component.html
+++ b/src/app/components/board/task/task.component.html
@@ -30,7 +30,11 @@
     <div class="footer">
       <div class="footer-badge">
         @for (assigned of task.assigned; track assigned) {
-        <span class="footer-badged">{{ userBadged(assigned) }}</span>
+        <span
+          class="footer-badged"
+          [style.background-color]="userBadgedColor(assigned)"
+          >{{ userBadged(assigned) }}</span
+        >
         }
       </div>
       <div class="footer-priority prio-{{ task.priority }}"></div>
diff --git a/src/app/components/board/task/task.component.scss b/src/app/components/board/task/task.component.scss
index dbcf3e6..3b567ea 100644
--- a/src/app/components/board/task/task.component.scss
+++ b/src/app/components/board/task/task.component.scss
@@ -100,7 +100,6 @@ section {
   min-height: 32px;
   border-radius: 45px;
   border: 1px solid var(--white);
-  background-color: red;
   color: var(--white);
   font-size: 12px;
   font-weight: 400;
diff --git a/src/app/components/board/task/task.component.ts b/src/app/components/board/task/task.component.ts
index 14759d5..effb289 100644
--- a/src/app/components/board/task/task.component.ts
+++ b/src/app/components/board/task/task.component.ts
@@ -45,7 +45,9 @@ export class TaskComponent {
 
   userBadged(id: number) {
     const userId = String(id);
-    const user = this.userService.getUsers().find((user) => user.id === userId);
+    const user = this.userService
+      .getAllUsers()
+      .find((user) => user.id === userId);
     if (user) {
       if (user.firstName === 'Guest') {
         return user.firstName.charAt(0);
@@ -58,4 +60,16 @@ export class TaskComponent {
       return;
     }
   }
+
+  userBadgedColor(id: number) {
+    const userId = String(id);
+    const user = this.userService
+      .getAllUsers()
+      .find((user) => user.id === userId);
+    if (user) {
+      return user.color;
+    } else {
+      return;
+    }
+  }
 }
diff --git a/src/app/components/contacts/contacts.component.ts b/src/app/components/contacts/contacts.component.ts
index 127462d..38c4339 100644
--- a/src/app/components/contacts/contacts.component.ts
+++ b/src/app/components/contacts/contacts.component.ts
@@ -33,7 +33,9 @@ export class ContactsComponent {
   }
 
   loadAllUserWithoutGuest(): User[] {
-    return this.userService.getUsers().filter((user) => user.initials !== 'G');
+    return this.userService
+      .getAllUsers()
+      .filter((user) => user.initials !== 'G');
   }
 
   sortUsersByFirstLetter(sortLetter: string) {
diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts
index 0dcb217..8882398 100644
--- a/src/app/services/user.service.ts
+++ b/src/app/services/user.service.ts
@@ -21,21 +21,20 @@ export class UserService implements OnDestroy {
     return onSnapshot(collection(this.firestore, 'users'), (list) => {
       this.allUsers = [];
       list.forEach((element) => {
-        const taskData = element.data() as User;
-        const taskWithId = { ...taskData };
-        taskWithId.id = element.id;
-        this.allUsers.push(taskWithId);
+        const userWithId = { id: element.id, ...element.data() } as User;
+        this.allUsers.push(userWithId);
       });
     });
   }
 
-  getUsers(): User[] {
+  getAllUsers(): User[] {
     return this.allUsers;
   }
 
   getUserDetails(userId: string, query: keyof User) {
-    const filteredUsers = this.getUsers().filter((user) => user.id === userId);
-    return filteredUsers.map((user) => user[query]);
+    return this.getAllUsers()
+      .filter((user) => user.id === userId)
+      .map((user) => user[query]);
   }
 
   ngOnDestroy() {