Merge pull request #95 from Snap-Spot/!HOTFIX

🔧 fix: 로그인하지 않아도 사진 작가 상세 조회 가능하도록 수정

snapspot-admin/src/main/java/snap/dto/MemberRes.java

@@ -0,0 +1,16 @@
+package snap.dto;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import snap.domains.member.entity.Member;
+
+@Getter
+@NoArgsConstructor
+public class MemberRes {
+
+	private Member member;
+
+	public MemberRes(Member member){
+		this.member = member;
+	}
+}

snapspot-admin/src/main/java/snap/service/JwtSecurityService.java

@@ -4,22 +4,28 @@
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import snap.domains.member.entity.Member;
+import snap.domains.member.service.MemberDomainService;
+import snap.dto.MemberRes;
 import snap.dto.TokenRes;
 import snap.enums.Role;
 import snap.jwt.JwtTokenUtil;
 
 import java.time.Duration;
 
+import javax.servlet.http.HttpServletRequest;
+
 @Service
 @RequiredArgsConstructor
 public class JwtSecurityService {
     private final JwtTokenUtil jwtUtil;
     private final AuthenticationManagerBuilder authenticationManagerBuilder;
     private final PasswordEncoder passwordEncoder;
     private final RedisService redisService;
+    private final MemberDomainService memberDomainService;
 
     public TokenRes createJwt(String email, String password) {
         UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(email, password);
@@ -57,4 +63,10 @@ public Boolean validateRefreshToken(Member member, String refreshToken) {
     public String encryptPassword(String password) {
         return passwordEncoder.encode(password);
     }
+
+    public MemberRes getMemberByRequest(HttpServletRequest request){
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        return new MemberRes(memberDomainService.findMemberByEmail(authentication.getName())
+            .orElseGet(() -> null));
+    }
 }

snapspot-api/src/main/java/snap/api/photographer/controller/PhotographerController.java

@@ -18,11 +18,13 @@
 import snap.domains.member.entity.Member;
 import snap.domains.photographer.entity.Photographer;
 import snap.dto.request.PhotographerFilterReq;
-import snap.resolver.AuthMember;
 import snap.resolver.AuthPhotographer;
+import snap.service.JwtSecurityService;
 
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/photographers")
@@ -31,6 +33,7 @@ public class PhotographerController {
     private final PhotographerService photographerService;
     private final ReviewService reviewService;
     private final MemberService memberService;
+    private final JwtSecurityService jwtSecurityService;
 
     @GetMapping("/me")
     public ResponseEntity<PhotographerResponseDto> photographerInfoFind(@AuthPhotographer Photographer photographer) {
@@ -44,7 +47,8 @@ public ResponseEntity<PhotographerResponseDto> photographerInfoUpdate(@AuthPhoto
     }
 
     @GetMapping("/{photographerId}")
-    public ResponseEntity<PhotographerWithHeartDto> photographerFindById(@PathVariable Long photographerId, @AuthMember Member member) {
+    public ResponseEntity<PhotographerWithHeartDto> photographerFindById(@PathVariable Long photographerId, HttpServletRequest request) {
+        Member member = jwtSecurityService.getMemberByRequest(request).getMember();
         return new ResponseEntity<>(photographerService.findPhotographer(photographerId, member), HttpStatus.OK);
     }
 

snapspot-domain/src/main/java/snap/domains/heart/service/HeartDomainService.java

@@ -40,6 +40,7 @@ public Photographer deleteHeart(Member member, Long photographerId){
     }
 
     public Boolean existsHeart(Member member, Photographer photographer){
+        if (member == null) return false;
         return heartRepository.existsByMemberAndPhotographer(member, photographer);
     }
 }