From d47170328caebd978d945c647f52a3dcf231fb8a Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 4 Sep 2025 18:13:56 +0900 Subject: [PATCH 1/2] chore: delete or user entity and mappers --- .../java/com/gltkorea/icebang/entity/Users.java | 11 ----------- .../com/gltkorea/icebang/mapper/UserMapper.java | 13 ------------- 2 files changed, 24 deletions(-) delete mode 100644 apps/user-service/src/main/java/com/gltkorea/icebang/entity/Users.java delete mode 100644 apps/user-service/src/main/java/com/gltkorea/icebang/mapper/UserMapper.java diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/entity/Users.java b/apps/user-service/src/main/java/com/gltkorea/icebang/entity/Users.java deleted file mode 100644 index 2536dfae..00000000 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/entity/Users.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.gltkorea.icebang.entity; - -import lombok.Data; - -@Data -// @TODO:: 우리 User entity에 맞게 설계 -// @TODO:: 관련 테이블들도 구성해야함 -public class Users { - private String email; - private String password; -} diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/UserMapper.java b/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/UserMapper.java deleted file mode 100644 index f09a152a..00000000 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/UserMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.gltkorea.icebang.mapper; - -import java.util.Optional; - -import org.apache.ibatis.annotations.Mapper; - -import com.gltkorea.icebang.dto.UserDto; - -@Mapper // Spring이 MyBatis Mapper로 인식하도록 설정 -public interface UserMapper { - // XML 파일의 id와 메서드 이름을 일치시켜야 합니다. - Optional findByEmail(String email); -} From f700e4ca43403f461d3be1a8634f53d666ec81c1 Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 4 Sep 2025 18:43:17 +0900 Subject: [PATCH 2/2] feat: Organization List (v0) api --- .../security/endpoints/SecurityEndpoints.java | 10 +++++++- .../controller/OrganizationController.java | 25 +++++++++++++++++++ .../organization/dto/OrganizationCardDto.java | 15 +++++++++++ .../service/OrganizationService.java | 22 ++++++++++++++++ .../icebang/mapper/OrganizationMapper.java | 12 +++++++++ .../mybatis/mapper/OrganizationMapper.xml | 15 +++++++++++ .../resources/mybatis/mapper/UserMapper.xml | 17 ------------- 7 files changed, 98 insertions(+), 18 deletions(-) create mode 100644 apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/controller/OrganizationController.java create mode 100644 apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/dto/OrganizationCardDto.java create mode 100644 apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/service/OrganizationService.java create mode 100644 apps/user-service/src/main/java/com/gltkorea/icebang/mapper/OrganizationMapper.java create mode 100644 apps/user-service/src/main/resources/mybatis/mapper/OrganizationMapper.xml delete mode 100644 apps/user-service/src/main/resources/mybatis/mapper/UserMapper.xml diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/config/security/endpoints/SecurityEndpoints.java b/apps/user-service/src/main/java/com/gltkorea/icebang/config/security/endpoints/SecurityEndpoints.java index e2d55727..c73f462d 100644 --- a/apps/user-service/src/main/java/com/gltkorea/icebang/config/security/endpoints/SecurityEndpoints.java +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/config/security/endpoints/SecurityEndpoints.java @@ -2,7 +2,15 @@ public enum SecurityEndpoints { PUBLIC( - "/", "/login", "/register", "/api/public/**", "/health", "/css/**", "/js/**", "/images/**"), + "/", + "/login", + "/register", + "/api/public/**", + "/health", + "/css/**", + "/js/**", + "/images/**", + "/v0/**"), // 데이터 관리 관련 엔드포인트 DATA_ADMIN("/admin/**", "/api/admin/**", "/management/**", "/actuator/**"), diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/controller/OrganizationController.java b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/controller/OrganizationController.java new file mode 100644 index 00000000..6861f163 --- /dev/null +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/controller/OrganizationController.java @@ -0,0 +1,25 @@ +package com.gltkorea.icebang.domain.organization.controller; + +import java.util.List; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.gltkorea.icebang.domain.organization.dto.OrganizationCardDto; +import com.gltkorea.icebang.domain.organization.service.OrganizationService; + +import lombok.RequiredArgsConstructor; + +@RequestMapping("/v0/organizations") +@RequiredArgsConstructor +@RestController +public class OrganizationController { + private final OrganizationService organizationService; + + @GetMapping("") + public List getOrganizations() { + + return organizationService.getAllOrganizationList(); + } +} diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/dto/OrganizationCardDto.java b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/dto/OrganizationCardDto.java new file mode 100644 index 00000000..af0ef64b --- /dev/null +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/dto/OrganizationCardDto.java @@ -0,0 +1,15 @@ +package com.gltkorea.icebang.domain.organization.dto; + +import java.math.BigInteger; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; + +@Data +@Builder +@AllArgsConstructor +public class OrganizationCardDto { + private BigInteger id; + private String organizationName; +} diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/service/OrganizationService.java b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/service/OrganizationService.java new file mode 100644 index 00000000..44899058 --- /dev/null +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/domain/organization/service/OrganizationService.java @@ -0,0 +1,22 @@ +package com.gltkorea.icebang.domain.organization.service; + +import java.util.List; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.gltkorea.icebang.domain.organization.dto.OrganizationCardDto; +import com.gltkorea.icebang.mapper.OrganizationMapper; + +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class OrganizationService { + private final OrganizationMapper organizationMapper; + + @Transactional(readOnly = true) + public List getAllOrganizationList() { + return organizationMapper.findAllOrganizations(); + } +} diff --git a/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/OrganizationMapper.java b/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/OrganizationMapper.java new file mode 100644 index 00000000..899eaef8 --- /dev/null +++ b/apps/user-service/src/main/java/com/gltkorea/icebang/mapper/OrganizationMapper.java @@ -0,0 +1,12 @@ +package com.gltkorea.icebang.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Mapper; + +import com.gltkorea.icebang.domain.organization.dto.OrganizationCardDto; + +@Mapper +public interface OrganizationMapper { + List findAllOrganizations(); +} diff --git a/apps/user-service/src/main/resources/mybatis/mapper/OrganizationMapper.xml b/apps/user-service/src/main/resources/mybatis/mapper/OrganizationMapper.xml new file mode 100644 index 00000000..ac4bf48f --- /dev/null +++ b/apps/user-service/src/main/resources/mybatis/mapper/OrganizationMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/apps/user-service/src/main/resources/mybatis/mapper/UserMapper.xml b/apps/user-service/src/main/resources/mybatis/mapper/UserMapper.xml deleted file mode 100644 index 68be89f9..00000000 --- a/apps/user-service/src/main/resources/mybatis/mapper/UserMapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - \ No newline at end of file