develop <- main

.github/workflows/deploy.yml

@@ -62,11 +62,6 @@ jobs:
           host: 3.39.139.208 # EC2 퍼블릿 IP
           username: ubuntu
           key: ${{ secrets.EC2_SSH_KEY }}
-          envs: |
-            SPRING_PROFILES_ACTIVE=prod
-            SPRING_DATASOURCE_PASSWORD=${{ secrets.SPRING_DATASOURCE_PASSWORD }}
-            JWT_SECRET=${{ secrets.JWT_SECRET }}
-            KAKAO_CLIENT_ID=${{ secrets.KAKAO_CLIENT_ID }}
           script: |
             cd /home/ubuntu/app
             chmod +x deploy.sh    # 스크립트 실행 권한 부여

deploy.sh

@@ -9,7 +9,7 @@ echo ">>> build file name: $JAR_NAME" >> /home/ubuntu/app/deploy.log
   sudo kill -15 $PID
   sleep 5
   fi
-  
+
   echo ">>> execute new jar file" >> /home/ubuntu/app/deploy.log
   cd /home/ubuntu/app
-  nohup sudo java -jar -Dspring.profiles.active=prod $BUILD_JAR > /home/ubuntu/app/application.log 2>&1 &
+  nohup sudo java -jar -Dspring.profiles.active=prod $BUILD_JAR > /home/ubuntu/app/application.log 2>&1 &

src/main/java/fitfit/HelloController.java

@@ -8,9 +8,10 @@
 @CrossOrigin(origins = "https://fitfit.site")
 public class HelloController {
 
-    @GetMapping("/hello") // 1. HTTP GET 요청을 '/hello' 경로와 매핑
+    @GetMapping("api/hello") // 1. HTTP GET 요청을 '/hello' 경로와 매핑
     public String getHelloMessage() {
         // 2. "환영합니다!" 라는 문자열을 반환
         return "환영합니다!";
     }
 }
+

src/main/java/fitfit/domain/category/entity/Category.java

@@ -0,0 +1,4 @@
+package fitfit.domain.category.entity;
+
+public class Category {
+}

src/main/java/fitfit/domain/chat/entity/BotChat.java

@@ -0,0 +1,4 @@
+package fitfit.domain.chat.entity;
+
+public class BotChat {
+}

src/main/java/fitfit/domain/chat/entity/UserChat.java

@@ -0,0 +1,4 @@
+package fitfit.domain.chat.entity;
+
+public class UserChat {
+}

src/main/java/fitfit/domain/chat/mapping/ChatRoom.java

@@ -0,0 +1,4 @@
+package fitfit.domain.chat.mapping;
+
+public class ChatRoom {
+}

src/main/java/fitfit/domain/clothes/mapping/WearRoom.java

@@ -0,0 +1,4 @@
+package fitfit.domain.clothes.mapping;
+
+public class WearRoom {
+}

src/main/java/fitfit/domain/member/controller/MemberRestController.java

@@ -19,7 +19,7 @@
 
 @Slf4j
 @RestController
-@RequestMapping("/members")
+@RequestMapping("/api/members")
 @RequiredArgsConstructor
 @Tag(name = "Member", description = "회원 관련 API")
 public class MemberRestController {

src/main/java/fitfit/domain/member/converter/MemberConverter.java

@@ -10,21 +10,22 @@
 import fitfit.global.enums.Provider;
 
 public class MemberConverter {
-    private static final String DEFAULT_NICKNAME = "핏핏이";
     private static final String DEFAULT_PROFILE_IMG_URL = "https://fitfit-profile-img.s3.ap-northeast-2.amazonaws.com/default_img.png";
-    private static final String DEFAULT_USER_CUSTOM_ID = "temp_fitfit";
     public static Member toMember (MemberDataDTO.MemberData kakaoMemberData, Provider provider) {
         return Member.builder()
                 .email(kakaoMemberData.getEmail())
-                .nickname(DEFAULT_NICKNAME)
+                .nickname("핏핏이")
                 .name("가입 중인 사용자")
                 .phoneNumber("임시 번호")
-                .userCustomId(DEFAULT_USER_CUSTOM_ID)
                 .profileImgUrl(DEFAULT_PROFILE_IMG_URL)
                 .provider(provider)
                 .providerId(kakaoMemberData.getSub())
                 .gender(Gender.NONE) // 다시 추가
                 .status(MemberStatus.PENDING)
+                .height("임시 키")
+                .weight("임시 체중")
+                .point(0)
+                .clean_index(50)
                 .build();
     }
 

src/main/java/fitfit/domain/member/entity/Member.java

@@ -28,56 +28,58 @@ public class Member extends BaseEntity {
     @Column(name = "member_id")
     private Long id;
 
-    private String email; //카카오 가입 시 아이디(이메일)
-
-    @Column(length = 25, nullable = false)
-    private String userCustomId; // 앱 자체 가입 시 아이디
-
-    private String password; // 앱 자체 가입 시 비밀번호
-
     @Column(length = 25, nullable = false)
     private String name; // 실제 이름
 
     @Column(length = 25, nullable = false)
     private String nickname; // 앱 자체 닉네임(중복 확인 필요)
 
+    private String email; //카카오 가입 시 아이디(이메일)
+
+    @Column(length = 255)
+    private String profileImgUrl; // 프로필 사진
+
+    @Enumerated(EnumType.STRING)
+    @Column(length = 10, nullable = false, updatable = false)
+    private Provider provider;
+
+    @Column(length = 255, nullable = false)
+    private String providerId;
+
     @Enumerated(EnumType.STRING)
     private Gender gender;
 
     @Column(length = 25, nullable = false)
     private String phoneNumber;
 
-    @Column(length = 25)
+    @Column(length = 25, nullable = false)
     private String height;
 
-    @Column(length = 25)
+    @Column(length = 25, nullable = false)
     private String weight;
 
-    @Column(length = 255)
-    private String profileImgUrl; // 프로필 사진
-
     @Column(length = 255)
     private String fullBodyImgUrl; // 전신 사진
 
-    @Enumerated(EnumType.STRING)
-    @Column(length = 10, nullable = false, updatable = false)
-    private Provider provider;
-
-    @Column(length = 255, nullable = false)
-    private String providerId;
-
     private LocalDate birth;
 
     @Enumerated(EnumType.STRING)
     @Column(length = 10, nullable = false)
     private MemberStatus status;  // 회원 가입 상태
 
     @Enumerated(EnumType.STRING)
-    @Column(length = 255)
+    @ElementCollection(fetch = FetchType.LAZY)
+    @CollectionTable(name = "member_preferred_style",
+        joinColumns = @JoinColumn(name = "member_id"))
+    @Column(name = "style_name", length = 25)
     private List<Style> preferredStyle;
 
     private LocalDateTime inactiveAt;
 
+    private Integer point;
+
+    private Integer clean_index;
+
     public void updateNickname(String nickname) {
         this.nickname = nickname;
     }
@@ -102,7 +104,18 @@ public void updateProfileImgUrl(String profileImgUrl) {
 
     public void updatePhoneNumber(String phoneNumber) {this.phoneNumber = phoneNumber;}
 
-    public void updatePreferredStyle(List<Style> preferredStyle) {this.preferredStyle = new ArrayList<>(preferredStyle);}
+    public void updatePreferredStyle(List<Style> newStyleList) {
+        if (this.preferredStyle == null) {
+            this.preferredStyle = new ArrayList<>();
+        } else {
+            this.preferredStyle.clear();
+        }
+
+        // 2. 새 리스트가 null이 아니고 비어있지 않다면, 모든 요소를 추가합니다.
+        if (newStyleList != null && !newStyleList.isEmpty()) {
+            this.preferredStyle.addAll(newStyleList);
+        }
+    }
 
     public void updateFullBodyImgUrl(String fullBodyImgUrl) {this.fullBodyImgUrl = fullBodyImgUrl;}
 

src/main/java/fitfit/domain/member/mapping/MemberAccount.java

@@ -0,0 +1,4 @@
+package fitfit.domain.member.mapping;
+
+public class MemberAccount {
+}

src/main/java/fitfit/domain/member/mapping/OrderHistory.java

@@ -0,0 +1,4 @@
+package fitfit.domain.member.mapping;
+
+public class OrderHistory {
+}

src/main/java/fitfit/domain/member/service/MemberCommandService.java

@@ -202,7 +202,9 @@ private void updateMemberInfo(Member member, MemberRequestDTO.MemberSignupReques
         member.updatePhoneNumber(request.getPhoneNumber());
         member.updateBirth(request.getBirth());
         member.updateGender(request.getGender());
-        if (!request.getStyleList().isEmpty()) {member.updatePreferredStyle(request.getStyleList());}
+        if (request.getStyleList() != null) {
+            member.updatePreferredStyle(request.getStyleList());
+        }
         if (request.getFullBodyImgUrl() != null) {
             member.updateFullBodyImgUrl(request.getFullBodyImgUrl());
         } else {

src/main/java/fitfit/domain/token/filter/JwtAuthenticationFilter.java

@@ -23,10 +23,11 @@
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
     // 토큰 없이도 가능하게
     private static final List<String> WHITE_LIST = List.of(
+            "/swagger-ui.html",
+            "/auth/**",
             "/swagger-ui/**",
             "/v3/api-docs/**",
-            "/auth/**",
-            "/members/auth/kko",
+            "/api/members/auth/kko",
             "/auth/refresh"
     );
 

src/main/java/fitfit/global/security/config/SecurityConfig.java

@@ -33,10 +33,11 @@ public SecurityFilterChain filterChain (HttpSecurity http) throws Exception {
                 .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .authorizeHttpRequests(auth -> auth
                         .requestMatchers(
+                                "/swagger-ui.html",
                                 "/auth/**",
                                 "/swagger-ui/**",
                                 "/v3/api-docs/**",
-                                "/members/auth/kko",
+                                "/api/members/auth/kko",
                                 "/auth/refresh"
                         ).permitAll()
                         .anyRequest().authenticated()