Merge branch 'develop' into feat/OPS-326-BE-feat-대시보드-데이터-저장-체계-구축

EpicFn · EpicFn · commit ff07dd54e242 · 2025-09-29T14:36:14.000+09:00
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/archive/folder/repository/FolderRepository.java b/src/main/java/org/tuna/zoopzoop/backend/domain/archive/folder/repository/FolderRepository.java
@@ -58,4 +58,8 @@ public interface FolderRepository extends JpaRepository<Folder, Integer>{
     """)
     Optional<Folder> findByIdAndMemberId(@Param("folderId") Integer folderId,
                                          @Param("memberId") Integer memberId);
+
+    Optional<Folder> findByArchiveIdAndName(Integer archiveId, String name);
+
+    List<Folder> findAllByArchiveId(Integer archiveId);
 }
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/auth/controller/ApiV1AuthController.java b/src/main/java/org/tuna/zoopzoop/backend/domain/auth/controller/ApiV1AuthController.java
@@ -122,6 +122,11 @@ public ResponseEntity<RsData<Void>> refreshToken(
                 .body(new RsData<>("200", "액세스 토큰을 재발급 했습니다.", null));
     }
 
+    /**
+     * 확장프로그램의 액세스 토큰 발급을 위한 백그라운드 풀링에 대응하는 API
+     * @param state 확장프로그램 로그인 시 전달한 state 값.
+     */
+
     @GetMapping("/result")
     @Operation(summary = "확장프로그램 백그라운드 풀링 대응 API")
     public ResponseEntity<RsData<AuthResultData>> pullingResult(
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/auth/dev/controller/DevController.java b/src/main/java/org/tuna/zoopzoop/backend/domain/auth/dev/controller/DevController.java
@@ -0,0 +1,35 @@
+package org.tuna.zoopzoop.backend.domain.auth.dev.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Profile;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
+import org.tuna.zoopzoop.backend.domain.member.entity.Member;
+import org.tuna.zoopzoop.backend.domain.member.enums.Provider;
+import org.tuna.zoopzoop.backend.domain.member.repository.MemberRepository;
+import org.tuna.zoopzoop.backend.global.security.jwt.JwtUtil;
+
+import java.util.Map;
+
+@Profile({"local","dev","staging","test"})
+@RestController
+@RequestMapping("/dev")
+@RequiredArgsConstructor
+public class DevController {
+
+    private final MemberRepository memberRepository;
+    private final JwtUtil jwtUtil;
+
+    @GetMapping("/token")
+    public Map<String, String> issueToken(
+            @RequestParam Provider provider,
+            @RequestParam String key
+    ) {
+        Member m = memberRepository.findByProviderAndProviderKey(provider, key)
+                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "member not found"));
+
+        String accessToken = jwtUtil.generateToken(m);
+        return Map.of("accessToken", accessToken);
+    }
+}
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/dashboard/entity/Node.java b/src/main/java/org/tuna/zoopzoop/backend/domain/dashboard/entity/Node.java
@@ -26,8 +26,8 @@ public class Node extends BaseEntity {
 
     @ElementCollection
     @CollectionTable(name = "node_data", joinColumns = @JoinColumn(name = "node_id"))
-    @MapKeyColumn(name = "key")
-    @Column(name = "value")
+    @MapKeyColumn(name = "data_key")
+    @Column(name = "data_value")
     private Map<String, String> data = new HashMap<>();
 
     @Column
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/datasource/repository/DataSourceRepository.java b/src/main/java/org/tuna/zoopzoop/backend/domain/datasource/repository/DataSourceRepository.java
@@ -39,5 +39,7 @@ public interface DataSourceRepository extends JpaRepository<DataSource, Integer>
         """)
     List<Integer> findExistingIdsInMember(@Param("memberId") Integer memberId, @Param("ids") Collection<Integer> ids);
 
+    Optional<DataSource> findByFolderIdAndTitle(Integer folderId, String title);
+
 }
 
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/member/controller/ApiV1MemberController.java b/src/main/java/org/tuna/zoopzoop/backend/domain/member/controller/ApiV1MemberController.java
@@ -8,10 +8,10 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
+import org.tuna.zoopzoop.backend.domain.member.dto.req.ReqBodyForEditMember;
 import org.tuna.zoopzoop.backend.domain.member.dto.req.ReqBodyForEditMemberName;
-import org.tuna.zoopzoop.backend.domain.member.dto.res.ResBodyForEditMemberName;
-import org.tuna.zoopzoop.backend.domain.member.dto.res.ResBodyForGetMemberInfo;
-import org.tuna.zoopzoop.backend.domain.member.dto.res.ResBodyForGetMemberInfoV2;
+import org.tuna.zoopzoop.backend.domain.member.dto.req.ReqBodyForEditMemberProfileImage;
+import org.tuna.zoopzoop.backend.domain.member.dto.res.*;
 import org.tuna.zoopzoop.backend.domain.member.entity.Member;
 import org.tuna.zoopzoop.backend.domain.member.service.MemberService;
 import org.tuna.zoopzoop.backend.global.rsData.RsData;
@@ -62,14 +62,14 @@ public ResponseEntity<RsData<ResBodyForGetMemberInfoV2>> getMemberInfo(
      * @param userDetails @AuthenticationPrincipal로 받아오는 현재 사용자 정보
      * @param reqBodyForEditMemberName 수정할 닉네임을 받아오는 reqDto
      */
-    @PutMapping("/edit")
+    @PutMapping("/edit/name")
     @Operation(summary = "사용자 닉네임 수정")
     public ResponseEntity<RsData<ResBodyForEditMemberName>> editMemberName(
             @AuthenticationPrincipal CustomUserDetails userDetails,
             @Valid @RequestBody ReqBodyForEditMemberName reqBodyForEditMemberName
             ) {
         Member member = userDetails.getMember();
-        member.updateName(reqBodyForEditMemberName.newName());
+        memberService.updateMemberName(member, reqBodyForEditMemberName.newName());
         return ResponseEntity
                 .status(HttpStatus.OK)
                 .body(
@@ -81,12 +81,64 @@ public ResponseEntity<RsData<ResBodyForEditMemberName>> editMemberName(
                 );
     }
 
+    /**
+     * 현재 로그인한 사용자의 프로필 이미지를 변경하는 API
+     * HTTP METHOD: PUT
+     * @param userDetails @AuthenticationPrincipal로 받아오는 현재 사용자 정보
+     * @param reqBodyForEditMemberProfileImage 수정할 프로필 이미지를 받아오는 dto
+     */
+    @PutMapping("/edit/image")
+    @Operation(summary = "사용자 닉네임 수정")
+    public ResponseEntity<RsData<ResBodyForEditMemberProfileImage>> editMemberProfileImage(
+            @AuthenticationPrincipal CustomUserDetails userDetails,
+            @Valid @RequestBody ReqBodyForEditMemberProfileImage reqBodyForEditMemberProfileImage
+            ) {
+        Member member = userDetails.getMember();
+        memberService.updateMemberProfileUrl(member, reqBodyForEditMemberProfileImage.file());
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(
+                        new RsData<>(
+                                "200",
+                                "사용자의 프로필 이미지를 변경했습니다.",
+                                new ResBodyForEditMemberProfileImage(member.getProfileImageUrl())
+                        )
+                );
+    }
+
+    /**
+     * 현재 로그인한 사용자의 닉네임과 프로필 이미지를 변경하는 API
+     * HTTP METHOD: PUT
+     * @param userDetails @AuthenticationPrincipal로 받아오는 현재 사용자 정보
+     * @param reqBodyForEditMember 수정할 프로필 정보를 받아오는 dto
+     */
+    @PutMapping("/edit")
+    @Operation(summary = "사용자 프로필 수정")
+    public ResponseEntity<RsData<ResBodyForEditMember>> editMemberProfile(
+            @AuthenticationPrincipal CustomUserDetails userDetails,
+            @Valid @RequestBody ReqBodyForEditMember reqBodyForEditMember
+    ) {
+        Member member = userDetails.getMember();
+        memberService.updateMemberProfile(member, reqBodyForEditMember.newName(), reqBodyForEditMember.file());
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(
+                        new RsData<>(
+                                "200",
+                                "사용자의 프로필을 변경했습니다.",
+                                new ResBodyForEditMember(member.getName(), member.getProfileImageUrl())
+                        )
+                );
+    }
+
+
     /**
      * 현재 로그인한 사용자를 삭제하는 API
      * 사용할 지 모르겠음.
      * HTTP METHOD: DELETE
      * @param userDetails @AuthenticationPrincipal로 받아오는 현재 사용자 정보
      */
+
     @DeleteMapping
     @Operation(summary = "사용자 삭제")
     public ResponseEntity<RsData<Void>> deleteMember(
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/req/ReqBodyForEditMember.java b/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/req/ReqBodyForEditMember.java
@@ -0,0 +1,17 @@
+package org.tuna.zoopzoop.backend.domain.member.dto.req;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import org.springframework.web.multipart.MultipartFile;
+
+public record ReqBodyForEditMember (
+        @NotBlank(message = "잘못된 요청입니다.") //MethodArgumentException
+        String newName,
+        @NotNull(message = "파일을 선택해주세요.")
+        MultipartFile file
+) {
+    public ReqBodyForEditMember(String newName, MultipartFile file) {
+        this.newName = newName;
+        this.file = file;
+    }
+}
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/req/ReqBodyForEditMemberProfileImage.java b/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/req/ReqBodyForEditMemberProfileImage.java
@@ -0,0 +1,13 @@
+package org.tuna.zoopzoop.backend.domain.member.dto.req;
+
+import jakarta.validation.constraints.NotNull;
+import org.springframework.web.multipart.MultipartFile;
+
+public record ReqBodyForEditMemberProfileImage (
+        @NotNull(message = "파일을 선택해주세요.")
+        MultipartFile file
+) {
+    public ReqBodyForEditMemberProfileImage(MultipartFile file) {
+        this.file = file;
+    }
+}
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/res/ResBodyForEditMember.java b/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/res/ResBodyForEditMember.java
@@ -0,0 +1,11 @@
+package org.tuna.zoopzoop.backend.domain.member.dto.res;
+
+public record ResBodyForEditMember(
+        String name,
+        String profileUrl
+) {
+    public ResBodyForEditMember(String name, String profileUrl) {
+        this.name = name;
+        this.profileUrl = profileUrl;
+    }
+}
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/res/ResBodyForEditMemberProfileImage.java b/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/res/ResBodyForEditMemberProfileImage.java
@@ -0,0 +1,9 @@
+package org.tuna.zoopzoop.backend.domain.member.dto.res;
+
+public record ResBodyForEditMemberProfileImage(
+        String profileUrl
+) {
+    public ResBodyForEditMemberProfileImage(String profileUrl) {
+        this.profileUrl = profileUrl;
+    }
+}
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/res/ResBodyForGetMemberInfoV2.java b/src/main/java/org/tuna/zoopzoop/backend/domain/member/dto/res/ResBodyForGetMemberInfoV2.java
@@ -2,18 +2,22 @@
 
 import org.tuna.zoopzoop.backend.domain.member.entity.Member;
 
+import java.time.LocalDateTime;
+
 public record ResBodyForGetMemberInfoV2(
         Integer id,
         String name,
         String profileUrl,
-        String provider
+        String provider,
+        LocalDateTime createAt
 ) {
     public ResBodyForGetMemberInfoV2(Member member){
         this(
                 member.getId(),
                 member.getName(),
                 member.getProfileImageUrl(),
-                member.getProvider().name()
+                member.getProvider().name(),
+                member.getCreateDate()
         );
     }
 }
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/member/entity/Member.java b/src/main/java/org/tuna/zoopzoop/backend/domain/member/entity/Member.java
@@ -54,9 +54,14 @@ public Member(String name, String providerKey, Provider provider, String profile
 
     //---------- 메소드 ----------//
     public boolean isActive() { return this.active; }
-    public void updateName(String name) { //사용자 이름 수정
+    public String updateName(String name) { //사용자 이름 수정
         this.name = name;
+        return this.name;
     } //사용자 이름 변경
     public void deactivate() { this.active = false; } //soft-delete
     public void activate() { this.active = true; } //restore
+    public String updateProfileUrl(String profileImageUrl) {
+        this.profileImageUrl = profileImageUrl;
+        return this.profileImageUrl;
+    }
 }
diff --git a/src/main/java/org/tuna/zoopzoop/backend/domain/member/service/MemberService.java b/src/main/java/org/tuna/zoopzoop/backend/domain/member/service/MemberService.java
@@ -5,10 +5,14 @@
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
 import org.tuna.zoopzoop.backend.domain.member.entity.Member;
 import org.tuna.zoopzoop.backend.domain.member.enums.Provider;
 import org.tuna.zoopzoop.backend.domain.member.repository.MemberRepository;
+import org.tuna.zoopzoop.backend.global.aws.S3Service;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -17,6 +21,7 @@
 @RequiredArgsConstructor
 public class MemberService {
     private final MemberRepository memberRepository;
+    private final S3Service s3Service;
 
     //회원 조회 관련
     public Member findById(Integer id) {
@@ -84,8 +89,40 @@ public void updateMemberName(Member member, String newName){
             throw new DataIntegrityViolationException("이미 사용중인 이름입니다.");
         }
         member.updateName(generateUniqueUserNameTag(newName));
+        memberRepository.save(member);
     }
 
+    @Transactional
+    public void updateMemberProfileUrl(Member member, MultipartFile file){
+        String extension = StringUtils.getFilenameExtension(file.getOriginalFilename());
+        String fileName = "profile/" + member.getId() + "/profile." + extension;
+        try {
+            String newUrl = s3Service.upload(file, fileName);
+            member.updateProfileUrl(newUrl);
+            memberRepository.save(member);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("잘못된 파일 입력입니다.");
+        }
+    }
+
+    @Transactional
+    public void updateMemberProfile(Member member, String newName, MultipartFile file){
+        if(memberRepository.findByName(newName).isPresent()) {
+            throw new DataIntegrityViolationException("이미 사용중인 이름입니다.");
+        }
+        member.updateName(generateUniqueUserNameTag(newName));
+        String extension = StringUtils.getFilenameExtension(file.getOriginalFilename());
+        String fileName = "profile/" + member.getId() + "/profile." + extension;
+        try {
+            String newUrl = s3Service.upload(file, fileName);
+            member.updateProfileUrl(newUrl);
+            memberRepository.save(member);
+        } catch (IOException e) {
+            throw new IllegalArgumentException("잘못된 파일 입력입니다.");
+        }
+    }
+
+
     //회원 삭제/복구 관련
     public void softDeleteMember(Member member){ member.deactivate(); }
     public void hardDeleteMember(Member member){ memberRepository.delete(member); }
diff --git a/src/main/java/org/tuna/zoopzoop/backend/global/initData/PersonalArchiveInitData.java b/src/main/java/org/tuna/zoopzoop/backend/global/initData/PersonalArchiveInitData.java
diff --git a/src/main/java/org/tuna/zoopzoop/backend/global/security/SecurityConfig.java b/src/main/java/org/tuna/zoopzoop/backend/global/security/SecurityConfig.java
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
diff --git a/src/test/java/org/tuna/zoopzoop/backend/domain/member/controller/MemberControllerTest.java b/src/test/java/org/tuna/zoopzoop/backend/domain/member/controller/MemberControllerTest.java

Original file line number	Diff line number	Diff line change
`@@ -58,4 +58,8 @@ public interface FolderRepository extends JpaRepository<Folder, Integer>{`
`58`	`58`	`""")`
`59`	`59`	`Optional<Folder> findByIdAndMemberId(@Param("folderId") Integer folderId,`
`60`	`60`	`@Param("memberId") Integer memberId);`
	`61`	`+`
	`62`	`+ Optional<Folder> findByArchiveIdAndName(Integer archiveId, String name);`
	`63`	`+`
	`64`	`+ List<Folder> findAllByArchiveId(Integer archiveId);`
`61`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,7 @@ public interface DataSourceRepository extends JpaRepository<DataSource, Integer>`
`39`	`39`	`""")`
`40`	`40`	`List<Integer> findExistingIdsInMember(@Param("memberId") Integer memberId, @Param("ids") Collection<Integer> ids);`
`41`	`41`
	`42`	`+ Optional<DataSource> findByFolderIdAndTitle(Integer folderId, String title);`
	`43`	`+`
`42`	`44`	`}`
`43`	`45`