Merge pull request #582 from woowacourse-teams/dev

fix: 로그인 버그 해결을 위해 v1.1.1 배포
woowacourse-teams · Sep 27, 2021 · 5c842c8 · 5c842c8
2 parents 38ccab4 + 7e856b8
commit 5c842c8
Show file tree

Hide file tree

Showing 62 changed files with 511 additions and 266 deletions.
diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/config/AuthenticationPrincipalConfig.java b/backend/src/main/java/com/woowacourse/zzimkkong/config/AuthenticationPrincipalConfig.java
@@ -1,7 +1,7 @@
 package com.woowacourse.zzimkkong.config;
 
-import com.woowacourse.zzimkkong.infrastructure.AuthenticationPrincipalArgumentResolver;
-import com.woowacourse.zzimkkong.infrastructure.LoginInterceptor;
+import com.woowacourse.zzimkkong.infrastructure.auth.AuthenticationPrincipalArgumentResolver;
+import com.woowacourse.zzimkkong.infrastructure.auth.LoginInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

diff --git a/...end/src/main/java/com/woowacourse/zzimkkong/config/datasource/CustomDataSourceConfig.java b/...end/src/main/java/com/woowacourse/zzimkkong/config/datasource/CustomDataSourceConfig.java
@@ -2,11 +2,7 @@
 
 import com.woowacourse.zzimkkong.exception.infrastructure.NoMasterDataSourceException;
 import com.zaxxer.hikari.HikariDataSource;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/controller/ManagerReservationController.java b/backend/src/main/java/com/woowacourse/zzimkkong/controller/ManagerReservationController.java
@@ -1,9 +1,9 @@
 package com.woowacourse.zzimkkong.controller;
 
-import com.woowacourse.zzimkkong.domain.Manager;
-import com.woowacourse.zzimkkong.domain.Member;
+import com.woowacourse.zzimkkong.domain.LoginEmail;
 import com.woowacourse.zzimkkong.dto.reservation.*;
 import com.woowacourse.zzimkkong.dto.slack.SlackResponse;
+import com.woowacourse.zzimkkong.dto.member.LoginEmailDto;
 import com.woowacourse.zzimkkong.service.ReservationService;
 import com.woowacourse.zzimkkong.service.SlackService;
 import com.woowacourse.zzimkkong.service.strategy.ManagerReservationStrategy;
@@ -37,12 +37,12 @@ public ResponseEntity<Void> create(
             @PathVariable final Long mapId,
             @PathVariable final Long spaceId,
             @RequestBody @Valid final ReservationCreateUpdateWithPasswordRequest reservationCreateUpdateWithPasswordRequest,
-            @Manager final Member manager) {
+            @LoginEmail final LoginEmailDto loginEmailDto) {
         ReservationCreateDto reservationCreateDto = ReservationCreateDto.of(
                 mapId,
                 spaceId,
                 reservationCreateUpdateWithPasswordRequest,
-                manager);
+                loginEmailDto);
         ReservationCreateResponse reservationCreateResponse = reservationService.saveReservation(reservationCreateDto, managerReservationStrategy);
         return ResponseEntity
                 .created(URI.create("/api/managers/maps/" + mapId + "/spaces/" + spaceId + "/reservations/" + reservationCreateResponse.getId()))
@@ -53,11 +53,11 @@ public ResponseEntity<Void> create(
     public ResponseEntity<ReservationFindAllResponse> findAll(
             @PathVariable final Long mapId,
             @RequestParam @DateTimeFormat(pattern = DATE_FORMAT) final LocalDate date,
-            @Manager final Member manager) {
+            @LoginEmail final LoginEmailDto loginEmailDto) {
         ReservationFindAllDto reservationFindAllDto = ReservationFindAllDto.of(
                 mapId,
                 date,
-                manager);
+                loginEmailDto);
         ReservationFindAllResponse reservationFindAllResponse = reservationService.findAllReservations(reservationFindAllDto, managerReservationStrategy);
         return ResponseEntity.ok().body(reservationFindAllResponse);
     }
@@ -67,12 +67,12 @@ public ResponseEntity<ReservationFindResponse> find(
             @PathVariable final Long mapId,
             @PathVariable final Long spaceId,
             @RequestParam @DateTimeFormat(pattern = DATE_FORMAT) final LocalDate date,
-            @Manager final Member manager) {
+            @LoginEmail final LoginEmailDto loginEmailDto) {
         ReservationFindDto reservationFindDto = ReservationFindDto.of(
                 mapId,
                 spaceId,
                 date,
-                manager);
+                loginEmailDto);
         ReservationFindResponse reservationFindResponse = reservationService.findReservations(reservationFindDto, managerReservationStrategy);
         return ResponseEntity.ok().body(reservationFindResponse);
     }
@@ -82,12 +82,12 @@ public ResponseEntity<ReservationResponse> findOne(
             @PathVariable final Long mapId,
             @PathVariable final Long spaceId,
             @PathVariable final Long reservationId,
-            @Manager final Member manager) {
+            @LoginEmail final LoginEmailDto loginEmailDto) {
         ReservationAuthenticationDto reservationAuthenticationDto = ReservationAuthenticationDto.of(
                 mapId,
                 spaceId,
                 reservationId,
-                manager);
+                loginEmailDto);
         ReservationResponse reservationResponse = reservationService.findReservation(reservationAuthenticationDto, managerReservationStrategy);
         return ResponseEntity.ok().body(reservationResponse);
     }
@@ -98,13 +98,13 @@ public ResponseEntity<Void> update(
             @PathVariable final Long spaceId,
             @PathVariable final Long reservationId,
             @RequestBody @Valid final ReservationCreateUpdateRequest reservationCreateUpdateRequest,
-            @Manager final Member manager) {
+            @LoginEmail final LoginEmailDto loginEmailDto) {
         ReservationUpdateDto reservationUpdateDto = ReservationUpdateDto.of(
                 mapId,
                 spaceId,
                 reservationId,
                 reservationCreateUpdateRequest,
-                manager);
+                loginEmailDto);
         SlackResponse slackResponse = reservationService.updateReservation(reservationUpdateDto, managerReservationStrategy);
         slackService.sendUpdateMessage(slackResponse);
         return ResponseEntity.ok().build();
@@ -115,12 +115,12 @@ public ResponseEntity<Void> delete(
             @PathVariable final Long mapId,
             @PathVariable final Long spaceId,
             @PathVariable final Long reservationId,
-            @Manager final Member manager) {
+            @LoginEmail final LoginEmailDto loginEmailDto) {
         ReservationAuthenticationDto reservationAuthenticationDto = ReservationAuthenticationDto.of(
                 mapId,
                 spaceId,
                 reservationId,
-                manager);
+                loginEmailDto);
         SlackResponse slackResponse = reservationService.deleteReservation(reservationAuthenticationDto, managerReservationStrategy);
         slackService.sendUpdateMessage(slackResponse);
         return ResponseEntity.noContent().build();

diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/controller/ManagerSpaceController.java b/backend/src/main/java/com/woowacourse/zzimkkong/controller/ManagerSpaceController.java
@@ -1,8 +1,8 @@
 package com.woowacourse.zzimkkong.controller;
 
-import com.woowacourse.zzimkkong.domain.Manager;
-import com.woowacourse.zzimkkong.domain.Member;
+import com.woowacourse.zzimkkong.domain.LoginEmail;
 import com.woowacourse.zzimkkong.dto.space.*;
+import com.woowacourse.zzimkkong.dto.member.LoginEmailDto;
 import com.woowacourse.zzimkkong.service.SpaceService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -23,25 +23,27 @@ public ManagerSpaceController(final SpaceService spaceService) {
     public ResponseEntity<Void> save(
             @PathVariable final Long mapId,
             @RequestBody @Valid final SpaceCreateUpdateRequest spaceCreateRequest,
-            @Manager final Member member) {
-        SpaceCreateResponse spaceCreateResponse = spaceService.saveSpace(mapId, spaceCreateRequest, member);
+            @LoginEmail final LoginEmailDto loginEmailDto) {
+        SpaceCreateResponse spaceCreateResponse = spaceService.saveSpace(mapId, spaceCreateRequest, loginEmailDto);
         return ResponseEntity
                 .created(URI.create("/api/managers/maps/" + mapId + "/spaces/" + spaceCreateResponse.getId()))
                 .build();
     }
 
     @GetMapping
-    public ResponseEntity<SpaceFindAllResponse> findAll(@PathVariable final Long mapId, @Manager final Member manager) {
-        SpaceFindAllResponse spaceFindAllResponse = spaceService.findAllSpace(mapId, manager);
+    public ResponseEntity<SpaceFindAllResponse> findAll(
+            @PathVariable final Long mapId,
+            @LoginEmail final LoginEmailDto loginEmailDto) {
+        SpaceFindAllResponse spaceFindAllResponse = spaceService.findAllSpace(mapId, loginEmailDto);
         return ResponseEntity.ok().body(spaceFindAllResponse);
     }
 
     @GetMapping("/{spaceId}")
     public ResponseEntity<SpaceFindDetailResponse> find(
             @PathVariable final Long mapId,
             @PathVariable final Long spaceId,
-            @Manager final Member manager) {
-        SpaceFindDetailResponse spaceFindDetailResponse = spaceService.findSpace(mapId, spaceId, manager);
+            @LoginEmail final LoginEmailDto loginEmailDto) {
+        SpaceFindDetailResponse spaceFindDetailResponse = spaceService.findSpace(mapId, spaceId, loginEmailDto);
         return ResponseEntity.ok().body(spaceFindDetailResponse);
     }
 
@@ -50,8 +52,8 @@ public ResponseEntity<Void> update(
             @PathVariable final Long mapId,
             @PathVariable final Long spaceId,
             @RequestBody final SpaceCreateUpdateRequest spaceCreateUpdateRequest,
-            @Manager final Member manager) {
-        spaceService.updateSpace(mapId, spaceId, spaceCreateUpdateRequest, manager);
+            @LoginEmail final LoginEmailDto loginEmailDto) {
+        spaceService.updateSpace(mapId, spaceId, spaceCreateUpdateRequest, loginEmailDto);
         return ResponseEntity.ok().build();
     }
 
@@ -60,8 +62,8 @@ public ResponseEntity<Void> delete(
             @PathVariable final Long mapId,
             @PathVariable final Long spaceId,
             @RequestBody SpaceDeleteRequest spaceDeleteRequest,
-            @Manager final Member manager) {
-        spaceService.deleteSpace(mapId, spaceId, spaceDeleteRequest, manager);
+            @LoginEmail final LoginEmailDto loginEmailDto) {
+        spaceService.deleteSpace(mapId, spaceId, spaceDeleteRequest, loginEmailDto);
         return ResponseEntity.noContent().build();
     }
 }
diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/controller/MapController.java b/backend/src/main/java/com/woowacourse/zzimkkong/controller/MapController.java
@@ -1,11 +1,11 @@
 package com.woowacourse.zzimkkong.controller;
 
-import com.woowacourse.zzimkkong.domain.Manager;
-import com.woowacourse.zzimkkong.domain.Member;
+import com.woowacourse.zzimkkong.domain.LoginEmail;
 import com.woowacourse.zzimkkong.dto.map.MapCreateResponse;
 import com.woowacourse.zzimkkong.dto.map.MapCreateUpdateRequest;
 import com.woowacourse.zzimkkong.dto.map.MapFindAllResponse;
 import com.woowacourse.zzimkkong.dto.map.MapFindResponse;
+import com.woowacourse.zzimkkong.dto.member.LoginEmailDto;
 import com.woowacourse.zzimkkong.service.MapService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -23,20 +23,20 @@ public MapController(final MapService mapService) {
     }
 
     @GetMapping("/{mapId}")
-    public ResponseEntity<MapFindResponse> find(@PathVariable final Long mapId, @Manager final Member manager) {
-        MapFindResponse mapFindResponse = mapService.findMap(mapId, manager);
+    public ResponseEntity<MapFindResponse> find(@PathVariable final Long mapId, @LoginEmail final LoginEmailDto loginEmailDto) {
+        MapFindResponse mapFindResponse = mapService.findMap(mapId, loginEmailDto);
         return ResponseEntity.ok().body(mapFindResponse);
     }
 
     @GetMapping
-    public ResponseEntity<MapFindAllResponse> findAll(@Manager final Member manager) {
-        MapFindAllResponse mapFindAllResponse = mapService.findAllMaps(manager);
+    public ResponseEntity<MapFindAllResponse> findAll(@LoginEmail final LoginEmailDto loginEmailDto) {
+        MapFindAllResponse mapFindAllResponse = mapService.findAllMaps(loginEmailDto);
         return ResponseEntity.ok().body(mapFindAllResponse);
     }
 
     @PostMapping
-    public ResponseEntity<Void> create(@Valid @RequestBody final MapCreateUpdateRequest mapCreateUpdateRequest, @Manager final Member manager) {
-        MapCreateResponse mapCreateResponse = mapService.saveMap(mapCreateUpdateRequest, manager);
+    public ResponseEntity<Void> create(@Valid @RequestBody final MapCreateUpdateRequest mapCreateUpdateRequest, @LoginEmail final LoginEmailDto loginEmailDto) {
+        MapCreateResponse mapCreateResponse = mapService.saveMap(mapCreateUpdateRequest, loginEmailDto);
         return ResponseEntity.created(URI.create("/api/managers/maps/" + mapCreateResponse.getId()))
                 .build();
     }
@@ -45,14 +45,14 @@ public ResponseEntity<Void> create(@Valid @RequestBody final MapCreateUpdateRequ
     public ResponseEntity<Void> update(
             @PathVariable final Long mapId,
             @Valid @RequestBody final MapCreateUpdateRequest mapCreateUpdateRequest,
-            @Manager final Member manager) {
-        mapService.updateMap(mapId, mapCreateUpdateRequest, manager);
+            @LoginEmail final LoginEmailDto loginEmailDto) {
+        mapService.updateMap(mapId, mapCreateUpdateRequest, loginEmailDto);
         return ResponseEntity.ok().build();
     }
 
     @DeleteMapping("/{mapId}")
-    public ResponseEntity<Void> delete(@PathVariable final Long mapId, @Manager final Member manager) {
-        mapService.deleteMap(mapId, manager);
+    public ResponseEntity<Void> delete(@PathVariable final Long mapId, @LoginEmail final LoginEmailDto loginEmailDto) {
+        mapService.deleteMap(mapId, loginEmailDto);
         return ResponseEntity.noContent().build();
     }
 }

diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/controller/MemberController.java b/backend/src/main/java/com/woowacourse/zzimkkong/controller/MemberController.java
@@ -1,9 +1,9 @@
 package com.woowacourse.zzimkkong.controller;
 
-import com.woowacourse.zzimkkong.domain.Manager;
-import com.woowacourse.zzimkkong.domain.Member;
+import com.woowacourse.zzimkkong.domain.LoginEmail;
 import com.woowacourse.zzimkkong.dto.member.*;
 import com.woowacourse.zzimkkong.dto.member.oauth.OauthMemberSaveRequest;
+import com.woowacourse.zzimkkong.dto.member.LoginEmailDto;
 import com.woowacourse.zzimkkong.service.MemberService;
 import com.woowacourse.zzimkkong.service.PresetService;
 import org.springframework.http.ResponseEntity;
@@ -58,45 +58,45 @@ public ResponseEntity<Void> validateEmail(
     @PostMapping("/presets")
     public ResponseEntity<Void> createPreset(
             @RequestBody @Valid final PresetCreateRequest presetCreateRequest,
-            @Manager final Member manager) {
-        PresetCreateResponse presetCreateResponse = presetService.savePreset(presetCreateRequest, manager);
+            @LoginEmail final LoginEmailDto loginEmailDto) {
+        PresetCreateResponse presetCreateResponse = presetService.savePreset(presetCreateRequest, loginEmailDto);
         return ResponseEntity
                 .created(URI.create("/api/managers/presets/" + presetCreateResponse.getId()))
                 .build();
     }
 
     @GetMapping("/presets")
-    public ResponseEntity<PresetFindAllResponse> findAllPresets(@Manager final Member manager) {
-        PresetFindAllResponse presetFindAllResponse = presetService.findAllPresets(manager);
+    public ResponseEntity<PresetFindAllResponse> findAllPresets(@LoginEmail final LoginEmailDto loginEmailDto) {
+        PresetFindAllResponse presetFindAllResponse = presetService.findAllPresets(loginEmailDto);
         return ResponseEntity.ok().body(presetFindAllResponse);
     }
 
     @DeleteMapping("/presets/{presetId}")
     public ResponseEntity<Void> deletePreset(
             @PathVariable final Long presetId,
-            @Manager final Member manager) {
-        presetService.deletePreset(presetId, manager);
+            @LoginEmail final LoginEmailDto loginEmailDto) {
+        presetService.deletePreset(presetId, loginEmailDto);
 
         return ResponseEntity.noContent().build();
     }
 
     @GetMapping("/me")
-    public ResponseEntity<MemberFindResponse> findMember(@Manager final Member manager) {
-        MemberFindResponse memberFindResponse = MemberFindResponse.from(manager);
+    public ResponseEntity<MemberFindResponse> findMember(@LoginEmail final LoginEmailDto loginEmailDto) {
+        MemberFindResponse memberFindResponse = memberService.findMember(loginEmailDto);
         return ResponseEntity.ok().body(memberFindResponse);
     }
 
     @PutMapping("/me")
     public ResponseEntity<MemberFindResponse> updateMember(
-            @Manager final Member manager,
+            @LoginEmail final LoginEmailDto loginEmailDto,
             @RequestBody @Valid final MemberUpdateRequest memberUpdateRequest) {
-        memberService.updateMember(manager, memberUpdateRequest);
+        memberService.updateMember(loginEmailDto, memberUpdateRequest);
         return ResponseEntity.ok().build();
     }
 
     @DeleteMapping("/me")
-    public ResponseEntity<Void> deleteMember(@Manager final Member manager) {
-        memberService.deleteMember(manager);
+    public ResponseEntity<Void> deleteMember(@LoginEmail final LoginEmailDto loginEmailDto) {
+        memberService.deleteMember(loginEmailDto);
         return ResponseEntity.noContent().build();
     }
 }
diff --git a/...woowacourse/zzimkkong/domain/Manager.java → ...wacourse/zzimkkong/domain/LoginEmail.java b/...woowacourse/zzimkkong/domain/Manager.java → ...wacourse/zzimkkong/domain/LoginEmail.java
@@ -7,5 +7,5 @@
 
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface Manager {
+public @interface LoginEmail {
 }
diff --git a/backend/src/main/java/com/woowacourse/zzimkkong/dto/member/LoginEmailDto.java b/backend/src/main/java/com/woowacourse/zzimkkong/dto/member/LoginEmailDto.java
@@ -0,0 +1,18 @@
+package com.woowacourse.zzimkkong.dto.member;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class LoginEmailDto {
+    private String email;
+
+    private LoginEmailDto(String email) {
+        this.email = email;
+    }
+
+    public static LoginEmailDto from(String email) {
+        return new LoginEmailDto(email);
+    }
+}