w7 Weekly2develop

kakao-tech-campus-2nd-step3 · Oct 18, 2024 · 06f8868 · 06f8868
2 parents eca9f81 + 4800e5b
commit 06f8868
Show file tree

Hide file tree

Showing 51 changed files with 1,382 additions and 266 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -2,9 +2,9 @@ name: CI/CD Pipeline
 
 on:
   push:
-    branches: [ week6 ]
+    branches: [ develop ]
     pull_request:
-      branches: [ week6 ]
+      branches: [ develop ]
 
 env:
   LIGHTSAIL_USERNAME: ubuntu
@@ -53,9 +53,7 @@ jobs:
                       client-secret: ${{
                         secrets.GOOGLE_CLIENT_SECRET
                       }}
-                      redirect-uri: "https://${{
-                        secrets.LIGHT_SAIL_IP
-                      }}/login/oauth2/code/google"
+                      redirect-uri: https://seamlessup.com/login/oauth2/code/google
                       scope:
                         - email
                         - profile
@@ -64,16 +62,6 @@ jobs:
                       authorization-uri: https://accounts.google.com/o/oauth2/auth
                       token-uri: https://oauth2.googleapis.com/token
                       user-info-uri: https://www.googleapis.com/oauth2/v3/userinfo
-            server:
-              port: 443
-              ssl:
-                enabled: true
-                key-store: /etc/letsencrypt/live/seamlessup.com/keystore.p12
-                key-store-password: ${{
-                  secrets.KEYSTORE_PASSWORD
-                }}
-                key-store-type: PKCS12
-                key-alias: tomcat
           EOF
 
       # Gradle 캐시 설정
@@ -131,16 +119,17 @@ jobs:
 
             CURRENT_PID=$(pgrep -f $JAR_NAME)
 
-            if [ -z $CURRENT_PID ]
+            if [ -n $CURRENT_PID ]
             then
               sleep 1
             else
               kill -15 $CURRENT_PID
-              sleep 5
+              wait $CURRENT_PID
+              sleep 10
             fi
 
             DEPLOY_PATH=/home/ubuntu/seamless/deploy/
-            mkdir $DEPLOY_PATH
+            mkdir -p $DEPLOY_PATH
             cp $BUILD_PATH $DEPLOY_PATH
             cd $DEPLOY_PATH
 

diff --git a/README.md b/README.md
@@ -2,9 +2,11 @@
 
 ---
 
-# 그라운드 룰
+# 프로젝트 구조도
+
+![seamless](https://github.com/user-attachments/assets/98d62cf5-8755-4980-9bea-a5ada9719ee7)
+
 
-- 추가 요망
 
 ---
 
@@ -122,6 +124,7 @@
 - [4주차 리뷰](https://github.com/kakao-tech-campus-2nd-step3/Team1_BE/issues/17)
 - [4주차 멘토링](https://quickest-asterisk-75d.notion.site/Back-end_-323b0e20ae2b405189ffe5b7c4242e00)
 - [5주차 리뷰](https://github.com/kakao-tech-campus-2nd-step3/Team1_BE/issues/31)
+- [6주차 피드백](https://github.com/kakao-tech-campus-2nd-step3/Team1_BE/pull/58)
 ---
 # Issue
 - [week4 프로젝트 빌드 실패](https://github.com/kakao-tech-campus-2nd-step3/Team1_BE/issues/27)
@@ -150,4 +153,4 @@
 - week5
   - softDelete의 구현 방법
   - 연결괸 객체의 정보를 가져오는 방법
-- week6
+- week6
diff --git a/src/main/java/team1/BE/seamless/DTO/InviteRequestDTO.java b/src/main/java/team1/BE/seamless/DTO/InviteRequestDTO.java
@@ -4,22 +4,32 @@
 // 요청을 보낼 때의 DTO
 public class InviteRequestDTO {
 
-    private Integer projectId;
+    private Long projectId;
     private String email;
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 
     public InviteRequestDTO() {
     }
 
-    public InviteRequestDTO(Integer projectId, String email) {
+    public InviteRequestDTO(Long projectId, String email, String name) {
         this.projectId = projectId;
         this.email = email;
+        this.name = name;
     }
 
-    public Integer getProjectId() {
+    public Long getProjectId() {
         return projectId;
     }
 
-    public void setProjectId(Integer projectId) {
+    public void setProjectId(Long projectId) {
         this.projectId = projectId;
     }
 

diff --git a/src/main/java/team1/BE/seamless/DTO/MemberDetailResponseDTO.java b/src/main/java/team1/BE/seamless/DTO/MemberDetailResponseDTO.java
diff --git a/src/main/java/team1/BE/seamless/DTO/MemberRequestDTO.java b/src/main/java/team1/BE/seamless/DTO/MemberRequestDTO.java
@@ -11,46 +11,71 @@ public static class getMemberList extends PageParam {
 
     }
 
-    public static class CreateMember {
-
-        @NotBlank(message = "이름은 필수 입력 사항입니다.")
-        @Size(max = 15, message = "이름은 공백 포함 최대 15글자까지 가능합니다.")
-        private String name;
+//    public static class CreateMember {
+//
+//        @NotBlank(message = "이름은 필수 입력 사항입니다.")
+//        @Size(max = 15, message = "이름은 공백 포함 최대 15글자까지 가능합니다.")
+//        private String name;
+//
+//        private String role;
+//
+//        @Email(message = "유효한 이메일 주소를 입력해주세요.")
+//        @NotBlank(message = "이메일은 필수 입력 사항입니다.")
+//        private String email;
+//
+//        private String imageURL;
+//
+//
+//        public CreateMember() {
+//        }
+//
+//        public CreateMember(String name, String role, String email, String imageURL) {
+//            this.name = name;
+//            this.role = role;
+//            this.email = email;
+//            this.imageURL = imageURL;
+//        }
+//
+//        public String getName() {
+//            return name;
+//        }
+//
+//        public String getRole() {
+//            return role;
+//        }
+//
+//        public String getEmail() {
+//            return email;
+//        }
+//
+//        public String getImageURL() {
+//            return imageURL;
+//        }
+//    }
 
-        @NotBlank(message = "역할은 필수 입력 사항입니다.")
-        @Size(max = 15, message = "역할은 공백 포함 최대 15글자까지 가능합니다.")
-        private String role;
+    public static class CreateMember {
 
         @Email(message = "유효한 이메일 주소를 입력해주세요.")
         @NotBlank(message = "이메일은 필수 입력 사항입니다.")
         private String email;
 
-        private String imageURL;
+        private String code;
+
 
         public CreateMember() {
         }
 
-        public CreateMember(String name, String role, String email, String imageURL) {
-            this.name = name;
-            this.role = role;
+        public CreateMember(String email, String code) {
             this.email = email;
-            this.imageURL = imageURL;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public String getRole() {
-            return role;
+            this.code = code;
         }
 
-        public String getEmail() {
+        public @Email(message = "유효한 이메일 주소를 입력해주세요.") @NotBlank(message = "이메일은 필수 입력 사항입니다.") String getEmail() {
             return email;
         }
 
-        public String getImageURL() {
-            return imageURL;
+        public String getCode() {
+            return code;
         }
     }
 
@@ -70,6 +95,14 @@ public static class UpdateMember {
         public UpdateMember() {
         }
 
+        public UpdateMember(String name, String role, String email, String imageURL, boolean test) {
+            this.name = name;
+            this.role = role;
+            this.email = email;
+            this.imageURL = imageURL;
+
+        }
+
         public UpdateMember(String name, String role, String email, String imageURL) {
             this.name = name;
             this.role = role;

diff --git a/src/main/java/team1/BE/seamless/DTO/MemberResponseDTO.java b/src/main/java/team1/BE/seamless/DTO/MemberResponseDTO.java
@@ -10,13 +10,23 @@ public class MemberResponseDTO {
 
     private String email;
 
+    private String code;
+
     public MemberResponseDTO(String message, String name, String role, String email) {
         this.message = message;
         this.name = name;
         this.role = role;
         this.email = email;
     }
 
+    public MemberResponseDTO(String message, String name, String role, String email, String code) {
+        this.message = message;
+        this.name = name;
+        this.role = role;
+        this.email = email;
+        this.code = code;
+    }
+
     public String getRole() {
         return role;
     }
@@ -48,4 +58,8 @@ public String getMessage() {
     public void setMessage(String message) {
         this.message = message;
     }
+
+    public String getCode() {
+        return code;
+    }
 }