feat#14/organization 조회

src/docs/asciidoc/api/domain/organization/Organization.adoc

@@ -11,4 +11,28 @@ include::{snippets}/organization-controller-test/create/request-fields.adoc[]
 ==== HTTP Response
 
 include::{snippets}/organization-controller-test/create/http-response.adoc[]
-include::{snippets}/organization-controller-test/create/response-fields-data.adoc[]
+include::{snippets}/organization-controller-test/create/response-fields-data.adoc[]
+
+=== Organization 조회 API
+
+==== 성공
+
+===== HTTP Request
+
+include::{snippets}/organization-controller-test/success_find/http-request.adoc[]
+
+===== HTTP Response
+
+include::{snippets}/organization-controller-test/success_find/http-response.adoc[]
+include::{snippets}/organization-controller-test/success_find/response-fields-data.adoc[]
+
+==== 실패
+
+===== HTTP Request
+
+include::{snippets}/organization-controller-test/fail_find/http-request.adoc[]
+
+===== HTTP Response
+
+include::{snippets}/organization-controller-test/fail_find/http-response.adoc[]
+include::{snippets}/organization-controller-test/fail_find/response-fields.adoc[]

src/main/java/com/wootecam/festivals/domain/organization/controller/OrganizationController.java

@@ -2,11 +2,14 @@
 
 import com.wootecam.festivals.domain.organization.dto.OrganizationCreateDto;
 import com.wootecam.festivals.domain.organization.dto.OrganizationIdDto;
+import com.wootecam.festivals.domain.organization.dto.OrganizationResponse;
 import com.wootecam.festivals.domain.organization.service.OrganizationService;
 import com.wootecam.festivals.global.api.ApiResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
+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.RequestMapping;
@@ -28,4 +31,10 @@ public ApiResponse<OrganizationIdDto> createOrganization(
 
         return ApiResponse.of(new OrganizationIdDto(organizationId));
     }
+
+    @ResponseStatus(HttpStatus.OK)
+    @GetMapping("/{organizationId}")
+    public ApiResponse<OrganizationResponse> findOrganization(@PathVariable Long organizationId) {
+        return ApiResponse.of(organizationService.findOrganization(organizationId));
+    }
 }

src/main/java/com/wootecam/festivals/domain/organization/dto/OrganizationResponse.java

@@ -0,0 +1,16 @@
+package com.wootecam.festivals.domain.organization.dto;
+
+import com.wootecam.festivals.domain.organization.entity.Organization;
+
+public record OrganizationResponse(Long organizationId,
+                                   String name,
+                                   String detail,
+                                   String profileImg) {
+
+    public static OrganizationResponse from(Organization organization) {
+        return new OrganizationResponse(organization.getId(),
+                organization.getName(),
+                organization.getDetail(),
+                organization.getProfileImg());
+    }
+}

src/main/java/com/wootecam/festivals/domain/organization/entity/OrganizationMember.java

@@ -3,6 +3,8 @@
 import com.wootecam.festivals.global.audit.BaseEntity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
@@ -24,6 +26,7 @@ public class OrganizationMember extends BaseEntity {
     private Long organizationId;
     @Column(nullable = false)
     private Long memberId;
+    @Enumerated(EnumType.STRING)
     private OrganizationRole role;
 
     @Builder

src/main/java/com/wootecam/festivals/domain/organization/exception/OrganizationErrorCode.java

@@ -0,0 +1,33 @@
+package com.wootecam.festivals.domain.organization.exception;
+
+import com.wootecam.festivals.global.docs.EnumType;
+import com.wootecam.festivals.global.exception.ErrorCode;
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+
+@Getter
+public enum OrganizationErrorCode implements ErrorCode, EnumType {
+
+    ORGANIZATION_NOT_FOUND(HttpStatus.NOT_FOUND, "ORG-0001", "해당하는 조직을 찾을 수 없습니다."),
+    ;
+
+    private final HttpStatus httpStatus;
+    private final String code;
+    private final String message;
+
+    OrganizationErrorCode(HttpStatus httpStatus, String code, String message) {
+        this.httpStatus = httpStatus;
+        this.code = code;
+        this.message = message;
+    }
+
+    @Override
+    public String getName() {
+        return name();
+    }
+
+    @Override
+    public String getDescription() {
+        return httpStatus + ": " + code + " - " + message;
+    }
+}

src/main/java/com/wootecam/festivals/domain/organization/repository/OrganizationRepository.java

@@ -1,7 +1,12 @@
 package com.wootecam.festivals.domain.organization.repository;
 
 import com.wootecam.festivals.domain.organization.entity.Organization;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 public interface OrganizationRepository extends JpaRepository<Organization, Long> {
+
+    @Query("select o from Organization o where o.id = :organizationId and o.isDeleted = false")
+    Optional<Organization> findById(Long organizationId);
 }

src/main/java/com/wootecam/festivals/domain/organization/service/OrganizationService.java

@@ -1,11 +1,14 @@
 package com.wootecam.festivals.domain.organization.service;
 
 import com.wootecam.festivals.domain.organization.dto.OrganizationCreateDto;
+import com.wootecam.festivals.domain.organization.dto.OrganizationResponse;
 import com.wootecam.festivals.domain.organization.entity.Organization;
 import com.wootecam.festivals.domain.organization.entity.OrganizationMember;
 import com.wootecam.festivals.domain.organization.entity.OrganizationRole;
+import com.wootecam.festivals.domain.organization.exception.OrganizationErrorCode;
 import com.wootecam.festivals.domain.organization.repository.OrganizationMemberRepository;
 import com.wootecam.festivals.domain.organization.repository.OrganizationRepository;
+import com.wootecam.festivals.global.exception.type.ApiException;
 import com.wootecam.festivals.global.utils.AuthenticationUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -27,6 +30,13 @@ public Long createOrganization(OrganizationCreateDto organizationCreateDto) {
         return newOrganization.getId();
     }
 
+    public OrganizationResponse findOrganization(Long organizationId) {
+        Organization organization = organizationRepository.findById(organizationId)
+                .orElseThrow(() -> new ApiException(OrganizationErrorCode.ORGANIZATION_NOT_FOUND));
+
+        return OrganizationResponse.from(organization);
+    }
+
     private Organization saveOrganization(OrganizationCreateDto organizationCreateDto) {
         return organizationRepository.save(organizationCreateDto.toEntity());
     }

src/test/java/com/wootecam/festivals/domain/organization/controller/OrganizationControllerTest.java

@@ -1,15 +1,20 @@
 package com.wootecam.festivals.domain.organization.controller;
 
+import static org.mockito.BDDMockito.given;
 import static org.springframework.restdocs.payload.PayloadDocumentation.beneathPath;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
 import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
 import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import com.wootecam.festivals.docs.utils.RestDocsSupport;
 import com.wootecam.festivals.domain.organization.dto.OrganizationCreateDto;
+import com.wootecam.festivals.domain.organization.dto.OrganizationResponse;
+import com.wootecam.festivals.domain.organization.exception.OrganizationErrorCode;
 import com.wootecam.festivals.domain.organization.service.OrganizationService;
+import com.wootecam.festivals.global.exception.type.ApiException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +40,7 @@ protected Object initController() {
     }
 
     @Test
-    @DisplayName("Organization을 생성한다")
+    @DisplayName("organization을 생성한다")
     void create() throws Exception {
         this.mockMvc.perform(post("/api/v1/organizations")
                         .content(objectMapper.writeValueAsString(
@@ -57,4 +62,37 @@ void create() throws Exception {
                                 fieldWithPath("organizationId").type(JsonFieldType.NUMBER).description("생성된 조직 ID")
                         )));
     }
+
+    @Test
+    @DisplayName("organization을 조회한다")
+    void success_find() throws Exception {
+        given(organizationService.findOrganization(1L))
+                .willReturn(new OrganizationResponse(1L, "testOrganization", "test detail", "test profile"));
+
+        this.mockMvc.perform(get("/api/v1/organizations/1"))
+                .andExpect(status().isOk())
+                .andDo(restDocs.document(
+                        responseFields(
+                                beneathPath("data").withSubsectionId("data"),
+                                fieldWithPath("organizationId").type(JsonFieldType.NUMBER).description("조회한 조직 ID"),
+                                fieldWithPath("name").type(JsonFieldType.STRING).description("조회한 조직 이름"),
+                                fieldWithPath("detail").type(JsonFieldType.STRING).description("조회한 조직 설명"),
+                                fieldWithPath("profileImg").type(JsonFieldType.STRING).description("조회한 조직 프로필 이미지")
+                        )));
+    }
+
+    @Test
+    @DisplayName("존재하지 않는 organization을 조회하면 404 에러를 반환한다")
+    void fail_find() throws Exception {
+        given(organizationService.findOrganization(1L))
+                .willThrow(new ApiException(OrganizationErrorCode.ORGANIZATION_NOT_FOUND));
+
+        this.mockMvc.perform(get("/api/v1/organizations/1"))
+                .andExpect(status().isNotFound())
+                .andDo(restDocs.document(
+                        responseFields(
+                                fieldWithPath("errorCode").type(JsonFieldType.STRING).description("에러 코드"),
+                                fieldWithPath("message").type(JsonFieldType.STRING).description("에러 설명 메시지")
+                        )));
+    }
 }

src/test/java/com/wootecam/festivals/domain/organization/service/OrganizationServiceTest.java

@@ -1,10 +1,13 @@
 package com.wootecam.festivals.domain.organization.service;
 
+import static com.wootecam.festivals.utils.Fixture.createOrganization;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 import com.wootecam.festivals.domain.member.repository.MemberRepository;
 import com.wootecam.festivals.domain.organization.dto.OrganizationCreateDto;
+import com.wootecam.festivals.domain.organization.dto.OrganizationResponse;
+import com.wootecam.festivals.domain.organization.entity.Organization;
 import com.wootecam.festivals.domain.organization.entity.OrganizationMember;
 import com.wootecam.festivals.domain.organization.entity.OrganizationRole;
 import com.wootecam.festivals.domain.organization.repository.OrganizationMemberRepository;
@@ -47,6 +50,7 @@ void setUp() {
     @Nested
     @DisplayName("로그인한 사용자가 Organization 생성 시")
     class create_organization {
+
         Authentication authentication = new Authentication(1L, "testUser", "testEmail");
 
         @BeforeEach
@@ -81,4 +85,36 @@ void it_returns_new_organization() {
             }
         }
     }
+
+    @Nested
+    @DisplayName("Organization 조회 시")
+    class find_organization {
+
+        Organization organization;
+        Long organizationId;
+
+        @BeforeEach
+        void setUp() {
+            organization = createOrganization("validName", "profile.jpg", "This is a valid detail.");
+            organizationId = organizationRepository.save(organization).getId();
+        }
+
+        @Nested
+        @DisplayName("Organization id가 주어지면")
+        class when_id_is_given {
+
+            @Test
+            @DisplayName("해당 organization 정보를 조회하여 반환한다")
+            void it_returns_organization() {
+                OrganizationResponse organizationResponse = organizationService.findOrganization(organizationId);
+
+                assertAll(() -> {
+                    assertThat(organizationResponse.organizationId()).isEqualTo(organizationId);
+                    assertThat(organizationResponse.name()).isEqualTo(organization.getName());
+                    assertThat(organizationResponse.detail()).isEqualTo(organization.getDetail());
+                    assertThat(organizationResponse.profileImg()).isEqualTo(organization.getProfileImg());
+                });
+            }
+        }
+    }
 }

src/test/java/com/wootecam/festivals/utils/Fixture.java

@@ -0,0 +1,17 @@
+package com.wootecam.festivals.utils;
+
+import com.wootecam.festivals.domain.organization.entity.Organization;
+
+public final class Fixture {
+
+    private Fixture() {
+    }
+
+    public static Organization createOrganization(String name, String detail, String profileImg) {
+        return Organization.builder()
+                .name(name)
+                .detail(detail)
+                .profileImg(profileImg)
+                .build();
+    }
+}