From 7bd06dee62a62a600207cbf5d62b5edc259c3e5d Mon Sep 17 00:00:00 2001
From: Jan-Marlon Leibl <jleibl@proton.me>
Date: Wed, 19 Feb 2025 12:23:45 +0100
Subject: [PATCH] refactor(user): reorganize imports and code structure

---
 .../de/szut/casino/user/UserController.java   | 17 ++++++++++++-----
 .../java/de/szut/casino/user/UserService.java | 19 +++++++------------
 frontend/src/app/app.routes.ts                |  5 ++---
 frontend/src/app/service/user.service.ts      |  1 +
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/backend/src/main/java/de/szut/casino/user/UserController.java b/backend/src/main/java/de/szut/casino/user/UserController.java
index 16bdf22..4d232ac 100644
--- a/backend/src/main/java/de/szut/casino/user/UserController.java
+++ b/backend/src/main/java/de/szut/casino/user/UserController.java
@@ -1,14 +1,20 @@
 package de.szut.casino.user;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RestController;
+
 import de.szut.casino.user.dto.CreateUserDto;
 import de.szut.casino.user.dto.GetUserDto;
 import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
 
 @Slf4j
 @RestController
@@ -22,6 +28,7 @@ public class UserController {
         if (id == null || !userService.exists(id)) {
             return ResponseEntity.notFound().build();
         }
+        
         return ResponseEntity.ok(userService.getUser(id));
     }
 
diff --git a/backend/src/main/java/de/szut/casino/user/UserService.java b/backend/src/main/java/de/szut/casino/user/UserService.java
index d114052..724962e 100644
--- a/backend/src/main/java/de/szut/casino/user/UserService.java
+++ b/backend/src/main/java/de/szut/casino/user/UserService.java
@@ -1,23 +1,18 @@
 package de.szut.casino.user;
 
-import de.szut.casino.user.dto.CreateUserDto;
-import de.szut.casino.user.dto.GetUserDto;
-import de.szut.casino.user.dto.KeycloakUserDto;
+import java.util.Optional;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.net.URI;
-import java.net.http.HttpClient;
-import org.springframework.http.HttpHeaders;
-import java.net.http.HttpRequest;
-import java.time.Duration;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import de.szut.casino.user.dto.CreateUserDto;
+import de.szut.casino.user.dto.GetUserDto;
+import de.szut.casino.user.dto.KeycloakUserDto;
 
 @Service
 public class UserService {
@@ -39,8 +34,8 @@ public class UserService {
 
     public GetUserDto getUser(String keycloakId) {
         Optional<UserEntity> user = this.userRepository.findOneByKeycloakId(keycloakId);
-        return user.map(userEntity -> mappingService.mapToGetUserDto(userEntity)).orElse(null);
 
+        return user.map(userEntity -> mappingService.mapToGetUserDto(userEntity)).orElse(null);
     }
 
     public GetUserDto getCurrentUser(String token) {
diff --git a/frontend/src/app/app.routes.ts b/frontend/src/app/app.routes.ts
index afab709..c7cfcf3 100644
--- a/frontend/src/app/app.routes.ts
+++ b/frontend/src/app/app.routes.ts
@@ -1,6 +1,5 @@
 import { Routes } from '@angular/router';
 import { LandingComponent } from './feature/landing/landing.component';
-import { HomeComponent } from './feature/home/home.component';
 import { authGuard } from './auth.guard';
 
 export const routes: Routes = [
@@ -11,10 +10,10 @@ export const routes: Routes = [
   {
     path: 'login/success',
     loadComponent: () => import('./feature/login-success/login-success.component'),
-  },
+  },  
   {
     path: 'home',
-    component: HomeComponent,
+    loadComponent: () => import('./feature/home/home.component'),
     canActivate: [authGuard],
   },
 ];
diff --git a/frontend/src/app/service/user.service.ts b/frontend/src/app/service/user.service.ts
index 927ba1c..2f9c22f 100644
--- a/frontend/src/app/service/user.service.ts
+++ b/frontend/src/app/service/user.service.ts
@@ -31,6 +31,7 @@ export class UserService {
         if (user) {
           return user;
         }
+        
         return await this.createUser(userProfile.id ?? '', userProfile.username ?? '').toPromise();
       });
   }