diff --git a/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java b/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java index 9365a34..e6ca4a3 100644 --- a/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java +++ b/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java @@ -2,7 +2,7 @@ package org.cmh.backend.UserManagement.controller; import jakarta.transaction.Transactional; import org.cmh.backend.UserManagement.service.UserManagementService; -import org.cmh.backend.authentication.model.User; +import org.cmh.backend.UserManagement.model.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/src/main/java/org/cmh/backend/authentication/model/User.java b/src/main/java/org/cmh/backend/UserManagement/model/User.java similarity index 97% rename from src/main/java/org/cmh/backend/authentication/model/User.java rename to src/main/java/org/cmh/backend/UserManagement/model/User.java index 98d2ab7..373eaf7 100644 --- a/src/main/java/org/cmh/backend/authentication/model/User.java +++ b/src/main/java/org/cmh/backend/UserManagement/model/User.java @@ -1,4 +1,4 @@ -package org.cmh.backend.authentication.model; +package org.cmh.backend.UserManagement.model; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java b/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java index 3fd6117..979fa88 100644 --- a/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java +++ b/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java @@ -1,6 +1,5 @@ package org.cmh.backend.UserManagement.repository; import org.cmh.backend.UserManagement.model.Tenant; -import org.cmh.backend.authentication.model.User; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java b/src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java index c87d4a3..250e33e 100644 --- a/src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java +++ b/src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java @@ -1,11 +1,8 @@ package org.cmh.backend.UserManagement.repository; -import org.cmh.backend.authentication.model.User; +import org.cmh.backend.UserManagement.model.User; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java b/src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java index ec5a454..1bd84b9 100644 --- a/src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java +++ b/src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java @@ -1,7 +1,7 @@ package org.cmh.backend.UserManagement.service; import org.cmh.backend.UserManagement.repository.UserManagementRepository; -import org.cmh.backend.authentication.model.User; +import org.cmh.backend.UserManagement.model.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java b/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java deleted file mode 100644 index 8ec56df..0000000 --- a/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.cmh.backend.authentication.controller; - - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -class AuthenticationController { - @GetMapping("/hello") - public String hello(){ - return "Hello SpringBoot!"; - } -} \ No newline at end of file diff --git a/src/main/java/org/cmh/backend/authentication/controller/UserController.java b/src/main/java/org/cmh/backend/authentication/controller/UserController.java index 7fde4c3..0a0700c 100644 --- a/src/main/java/org/cmh/backend/authentication/controller/UserController.java +++ b/src/main/java/org/cmh/backend/authentication/controller/UserController.java @@ -1,6 +1,6 @@ package org.cmh.backend.authentication.controller; -import org.cmh.backend.authentication.model.User; +import org.cmh.backend.UserManagement.model.User; import org.cmh.backend.authentication.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java index 492004a..9144a44 100644 --- a/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java +++ b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java @@ -1,6 +1,6 @@ package org.cmh.backend.authentication.repository; -import org.cmh.backend.authentication.model.User; +import org.cmh.backend.UserManagement.model.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java b/src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/java/org/cmh/backend/authentication/service/UserService.java b/src/main/java/org/cmh/backend/authentication/service/UserService.java index ee8a2c6..7e8f794 100644 --- a/src/main/java/org/cmh/backend/authentication/service/UserService.java +++ b/src/main/java/org/cmh/backend/authentication/service/UserService.java @@ -1,9 +1,8 @@ package org.cmh.backend.authentication.service; -import org.cmh.backend.authentication.model.User; +import org.cmh.backend.UserManagement.model.User; import org.cmh.backend.authentication.repository.UserRepository; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; @Service