From 2e8e81c3359e91e7d566c325f8f1a7859f39792e Mon Sep 17 00:00:00 2001 From: nuyh Date: Mon, 27 Nov 2023 15:24:01 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=20=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=EC=97=90=20=EC=A7=80=EC=97=AD=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/busan/member/MemberService.java | 1 + .../busan/member/dto/MemberInfoResponse.java | 3 +- src/main/resources/static/api/openapi3.yaml | 61 ++++++++++--------- .../busan/member/MemberControllerTest.java | 3 +- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/example/busan/member/MemberService.java b/src/main/java/com/example/busan/member/MemberService.java index 457bd91..ef35a84 100644 --- a/src/main/java/com/example/busan/member/MemberService.java +++ b/src/main/java/com/example/busan/member/MemberService.java @@ -85,6 +85,7 @@ public MemberInfoResponse getMemberInfo(final Authentication authentication) { member.getEmail(), authentication.role(), member.getCompany(), + member.getRegion(), member.getCreatedAt()); } } diff --git a/src/main/java/com/example/busan/member/dto/MemberInfoResponse.java b/src/main/java/com/example/busan/member/dto/MemberInfoResponse.java index eaef2d4..e46ad67 100644 --- a/src/main/java/com/example/busan/member/dto/MemberInfoResponse.java +++ b/src/main/java/com/example/busan/member/dto/MemberInfoResponse.java @@ -1,9 +1,10 @@ package com.example.busan.member.dto; +import com.example.busan.member.domain.Region; import com.example.busan.member.domain.Role; import java.time.LocalDateTime; public record MemberInfoResponse(String name, String phone, String email, Role role, String company, - LocalDateTime createdAt) { + Region region, LocalDateTime createdAt) { } diff --git a/src/main/resources/static/api/openapi3.yaml b/src/main/resources/static/api/openapi3.yaml index eba8a42..184d651 100644 --- a/src/main/resources/static/api/openapi3.yaml +++ b/src/main/resources/static/api/openapi3.yaml @@ -149,12 +149,12 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/members-140297472' + $ref: '#/components/schemas/members1182193868' examples: 현재 유저 정보 조회하기: value: "{\"name\":\"연어\",\"phone\":\"01012341234\",\"email\":\"\ - test@naver.com\",\"role\":\"USER\",\"company\":\"우형\",\"createdAt\"\ - :\"2023-11-25T21:57:28.839265\"}" + test@naver.com\",\"role\":\"USER\",\"company\":\"우형\",\"region\"\ + :\"BUSAN\",\"createdAt\":\"2023-11-27T15:23:52.095109\"}" post: tags: - members @@ -279,13 +279,13 @@ paths: examples: 자신의 회의실 예약 목록 최신 순으로 보기: value: "[{\"id\":1,\"status\":\"RESERVED\",\"cancelReason\":null,\"\ - startTime\":\"2023-11-25T21:57:30.235679\",\"endTime\":\"2023-11-25T23:57:30.235684\"\ + startTime\":\"2023-11-27T15:23:53.632779\",\"endTime\":\"2023-11-27T17:23:53.632784\"\ ,\"name\":\"황재현\",\"phone\":\"01012341234\",\"reservedAt\":\"\ - 2023-11-25T21:57:30.235693\",\"roomId\":1,\"roomName\":\"대회의실\"\ + 2023-11-27T15:23:53.632794\",\"roomId\":1,\"roomName\":\"대회의실\"\ },{\"id\":2,\"status\":\"CANCELED\",\"cancelReason\":\"쓰기 싫어졌어\ - 요..\",\"startTime\":\"2023-11-25T21:57:30.235701\",\"endTime\"\ - :\"2023-11-25T23:57:30.235703\",\"name\":\"황재현\",\"phone\":\"\ - 01012341234\",\"reservedAt\":\"2023-11-25T21:57:30.235705\",\"\ + 요..\",\"startTime\":\"2023-11-27T15:23:53.632803\",\"endTime\"\ + :\"2023-11-27T17:23:53.632804\",\"name\":\"황재현\",\"phone\":\"\ + 01012341234\",\"reservedAt\":\"2023-11-27T15:23:53.632807\",\"\ roomId\":1,\"roomName\":\"대회의실\"}]" post: tags: @@ -422,27 +422,6 @@ components: email: type: string description: 이메일 형식 - members-140297472: - type: object - properties: - createdAt: - type: string - description: 가입일 - role: - type: string - description: 계정 권한 - phone: - type: string - description: 휴대폰 - name: - type: string - description: 이름 - company: - type: string - description: 회사 - email: - type: string - description: 이메일 members-email-1386460070: type: object properties: @@ -529,6 +508,30 @@ components: email: type: string description: 이메일 + members1182193868: + type: object + properties: + createdAt: + type: string + description: 가입일 + role: + type: string + description: 계정 권한 + phone: + type: string + description: 휴대폰 + name: + type: string + description: 이름 + company: + type: string + description: 회사 + region: + type: string + description: 지역 + email: + type: string + description: 이메일 reservations-reservationId-361069914: type: object properties: diff --git a/src/test/java/com/example/busan/member/MemberControllerTest.java b/src/test/java/com/example/busan/member/MemberControllerTest.java index 23c5255..bd40e5e 100644 --- a/src/test/java/com/example/busan/member/MemberControllerTest.java +++ b/src/test/java/com/example/busan/member/MemberControllerTest.java @@ -202,7 +202,7 @@ void getMemberInfo() throws Exception { //given httpSession.setAttribute(AUTHORIZATION, new Authentication("email@naver.com", Role.USER)); given(memberService.getMemberInfo(any())) - .willReturn(new MemberInfoResponse("연어", "01012341234", "test@naver.com", Role.USER, "우형", LocalDateTime.now())); + .willReturn(new MemberInfoResponse("연어", "01012341234", "test@naver.com", Role.USER, "우형", Region.BUSAN, LocalDateTime.now())); //when final MockHttpServletResponse response = mockMvc.perform( @@ -215,6 +215,7 @@ void getMemberInfo() throws Exception { fieldWithPath("company").description("회사"), fieldWithPath("createdAt").description("가입일"), fieldWithPath("email").description("이메일"), + fieldWithPath("region").description("지역"), fieldWithPath("role").description("계정 권한")))) .andReturn() .getResponse();