Merge pull request #44 from DDD-Community/feature/ITDS-68-refactor-v1

Feature/itds 68 refactor v1

.github/workflows/cicd.yml

@@ -33,6 +33,12 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
+      # 배포 시작 알림 전송
+      - name: Start Deployment
+        continue-on-error: true
+        run: |
+          curl -X POST -H "Content-Type: application/json" --data '{"content":"🚀 Deployment has started."}' ${{ secrets.DISCORD_WEBHOOK }}
+
       # Docker Hub 로그인
       - name: Login to Docker Hub
         uses: docker/login-action@v1
@@ -66,12 +72,6 @@ jobs:
         run: |
           aws ec2 authorize-security-group-ingress --group-id ${{ secrets.AWS_SG_ID }} --protocol tcp --port 22 --cidr ${{ steps.ip.outputs.ipv4 }}/32
 
-      # 배포 시작 알림 전송
-      - name: Start Deployment
-        continue-on-error: true
-        run: |
-          curl -X POST -H "Content-Type: application/json" --data '{"content":"Deployment started!"}' ${{ secrets.DISCORD_WEBHOOK }}
-
       # ssh로 접속해 재배포
       - name: Deploy
         uses: appleboy/ssh-action@master
@@ -85,18 +85,18 @@ jobs:
             docker-compose pull
             docker-compose up -d
 
+      # 배포 후 보안 그룹에서 github ip 삭제
+      - name: Remove Github Actions IP From Security Group
+        if: always()
+        run: |
+          aws ec2 revoke-security-group-ingress --group-id ${{ secrets.AWS_SG_ID }} --protocol tcp --port 22 --cidr ${{ steps.ip.outputs.ipv4 }}/32
+
       # 배포 완료 알림 전송
       - name: Notify Deployment Completed
         if: success()
         run: |
-          curl -X POST -H "Content-Type: application/json" --data '{"content":"Deployment completed successfully!"}' ${{ secrets.DISCORD_WEBHOOK }}
+          curl -X POST -H "Content-Type: application/json" --data '{"content":"✅ Deployment completed successfully!"}' ${{ secrets.DISCORD_WEBHOOK }}
       - name: Notify Deployment Failed
         if: failure()
         run: |
-          curl -X POST -H "Content-Type: application/json" --data '{"content":"Deployment failed!"}' ${{ secrets.DISCORD_WEBHOOK }}
-
-      # 배포 후 보안 그룹에서 github ip 삭제
-      - name: Remove Github Actions IP From Security Group
-        if: always()
-        run: |
-          aws ec2 revoke-security-group-ingress --group-id ${{ secrets.AWS_SG_ID }} --protocol tcp --port 22 --cidr ${{ steps.ip.outputs.ipv4 }}/32
+          curl -X POST -H "Content-Type: application/json" --data '{"content":"❌ Deployment failed...😢 Check the logs and try again!"}' ${{ secrets.DISCORD_WEBHOOK }}

src/main/java/com/dissonance/itit/DissonanceApplication.java

@@ -8,8 +8,8 @@
 @SpringBootApplication
 public class DissonanceApplication {
 
-    public static void main(String[] args) {
-        SpringApplication.run(DissonanceApplication.class, args);
-    }
+	public static void main(String[] args) {
+		SpringApplication.run(DissonanceApplication.class, args);
+	}
 
 }

src/main/java/com/dissonance/itit/domain/entity/Report.java → src/main/java/com/dissonance/itit/bookmark/domain/Bookmark.java

@@ -1,4 +1,7 @@
-package com.dissonance.itit.domain.entity;
+package com.dissonance.itit.bookmark.domain;
+
+import com.dissonance.itit.post.domain.InfoPost;
+import com.dissonance.itit.user.domain.User;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -9,7 +12,6 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
-import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -21,8 +23,8 @@
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "report")
-public class Report {
+@Table(name = "bookmark")
+public class Bookmark {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "id")
@@ -33,10 +35,6 @@ public class Report {
 	private User user;
 
 	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "info_post_id")
-	private InfoPost infoPost;
-
-	@Size(max = 255)
-	@Column(name = "content")
-	private String content;
+	@JoinColumn(name = "post_id")
+	private InfoPost post;
 }

src/main/java/com/dissonance/itit/common/annotation/CurrentUser.java → src/main/java/com/dissonance/itit/global/common/annotation/CurrentUser.java

@@ -1,4 +1,4 @@
-package com.dissonance.itit.common.annotation;
+package com.dissonance.itit.global.common.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;