Merge pull request #49 from prgrms-web-devcourse-final-project/develop

Chore[deploy]: 중단배포

Author: DooHyoJeong

.github/workflows/CI-CD_Pipeline.yml

@@ -185,22 +185,54 @@ jobs:
   deploy:
     needs: docker-build
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/main'   # ✅ main 브랜치일 때만 실행
     env:
       DOCKER_IMAGE_NAME: balaw
     steps:
+      - name: Create prod .env file
+        run: |
+          cat > .env << 'EOF'
+          SPRING_PROFILES_ACTIVE=prod
+          PROD_DATASOURCE_URL=jdbc:mysql://mysql_1:3306/${{ secrets.DB_NAME }}
+          PROD_DATASOURCE_USERNAME=${{ secrets.DB_USER }}
+          PROD_DATASOURCE_PASSWORD=${{ secrets.DB_PASSWORD }}
+      
+          PROD_REDIS_HOST=redis_1
+          PROD_REDIS_PORT=6379
+          PROD_REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}
+          EOF
+
       - name: AWS SSM Send-Command
         uses: peterkimzz/aws-ssm-send-command@master
         id: ssm
         with:
           aws-region: ${{ secrets.AWS_REGION }}
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          instance-ids: "i-006c2e31391fac356"
+          instance-ids: "i-094fd5f8988b7330b"
           working-directory: /
           comment: Deploy
           command: |
+            # EC2 내부에서 prod.env 파일 생성
+            cat > /home/ec2-user/prod.env << 'EOF'
+            SPRING_PROFILES_ACTIVE=prod
+      
+            PROD_DATASOURCE_URL=jdbc:mysql://mysql_1:3306/${{ secrets.DB_NAME }}
+            PROD_DATASOURCE_USERNAME=${{ secrets.DB_USER }}
+            PROD_DATASOURCE_PASSWORD=${{ secrets.DB_PASSWORD }}
+      
+            PROD_REDIS_HOST=redis_1
+            PROD_REDIS_PORT=6379
+            PROD_REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}
+            EOF
+            
+            # 최신 이미지 pull & 컨테이너 실행
             docker pull ghcr.io/doohyojeong/${{ env.DOCKER_IMAGE_NAME }}:latest
             docker stop app1 2>/dev/null
             docker rm app1 2>/dev/null
-            docker run -d --name app1 -p 8080:8080 ghcr.io/doohyojeong/${{ env.DOCKER_IMAGE_NAME }}:latest
-            docker rmi $(docker images -f "dangling=true" -q)
+            docker run --env-file /home/ec2-user/prod.env -d --name app1 -p 8080:8080 \
+            ghcr.io/doohyojeong/${{ env.DOCKER_IMAGE_NAME }}:latest
+            
+            # dangling image 정리 + .env 삭제
+            docker rmi $(docker images -f "dangling=true" -q)
+            rm -f /home/ec2-user/prod.env

backend/Dockerfile

@@ -25,7 +25,6 @@ WORKDIR /app
 
 # 첫 번째 스테이지에서 빌드된 JAR 파일 복사
 COPY --from=builder /app/build/libs/*.jar app.jar
-COPY --from=builder /app/.env .env
 
 # 실행할 JAR 파일 지정
 ENTRYPOINT ["java", "-Dspring.profiles.active=prod", "-jar", "app.jar"]

backend/src/main/java/com/ai/lawyer/domain/law/entity/Hang.java

@@ -0,0 +1,31 @@
+package com.ai.lawyer.domain.law.entity;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import jakarta.persistence.*;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Data
+public class Hang {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @JsonIgnore
+    private Long id;
+
+    @Column(nullable = true, columnDefinition = "TEXT")
+    String content;
+
+    @ManyToOne
+    @JoinColumn(name = "jo_id")
+    @JsonBackReference
+    private Jo jo;
+
+    @OneToMany(mappedBy = "hang")
+    @JsonManagedReference
+    private List<Ho> hoList = new ArrayList<>();
+}

backend/src/main/java/com/ai/lawyer/domain/law/entity/Ho.java

@@ -0,0 +1,23 @@
+package com.ai.lawyer.domain.law.entity;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.*;
+import lombok.Data;
+
+@Entity
+@Data
+public class Ho {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @JsonIgnore
+    private Long id;
+
+    @Column(nullable = true, columnDefinition = "TEXT")
+    String content;
+
+    @ManyToOne
+    @JoinColumn(name = "hang_id")
+    @JsonBackReference
+    private Hang hang;
+}

backend/src/main/java/com/ai/lawyer/domain/law/entity/Jang.java

@@ -0,0 +1,31 @@
+package com.ai.lawyer.domain.law.entity;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import jakarta.persistence.*;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Data
+public class Jang {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @JsonIgnore
+    private Long id;
+
+    @Column(nullable = true, columnDefinition = "TEXT")
+    String content;
+
+    @ManyToOne
+    @JoinColumn(name = "law_id")
+    @JsonBackReference
+    private Law law;
+
+    @OneToMany(mappedBy = "jang")
+    @JsonManagedReference
+    private List<Jo> joList = new ArrayList<>();
+}

backend/src/main/java/com/ai/lawyer/domain/law/entity/Jo.java

@@ -0,0 +1,31 @@
+package com.ai.lawyer.domain.law.entity;
+
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import jakarta.persistence.*;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Data
+public class Jo {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @JsonIgnore
+    private Long id;
+
+    @Column(nullable = true, columnDefinition = "TEXT")
+    String content;
+
+    @ManyToOne
+    @JoinColumn(name = "jang_id")
+    @JsonBackReference
+    private Jang jang;
+
+    @OneToMany(mappedBy = "jo")
+    @JsonManagedReference
+    private List<Hang> hangList = new ArrayList<>();
+}

backend/src/main/java/com/ai/lawyer/domain/law/entity/Law.java

@@ -0,0 +1,36 @@
+package com.ai.lawyer.domain.law.entity;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import jakarta.persistence.*;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Data
+public class Law {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @JsonIgnore
+    private Long id;
+
+    private String lawName; // 법령명
+
+    private String lawField; // 법령분야
+
+    private String ministry; // 소관부처
+
+    private String promulgationNumber; // 공포번호
+
+    private LocalDate promulgationDate; // 공포일자
+
+    private LocalDate enforcementDate; // 시행일자
+
+    @OneToMany(mappedBy = "law")
+    @JsonManagedReference
+    private List<Jang> jangList = new ArrayList<>();
+}

backend/src/main/java/com/ai/lawyer/domain/precedent/entity/Precedent.java

@@ -0,0 +1,59 @@
+package com.ai.lawyer.domain.precedent.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.*;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Entity
+@Data
+public class Precedent {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @JsonIgnore
+    private Long id;
+
+    private String precedentNumber; // 판례일련번호
+
+    @Lob
+    @Column(columnDefinition = "TEXT")
+    private String caseName; // 사건명
+
+    private String caseNumber; // 사건번호
+
+    private LocalDate sentencingDate; // 선고일자
+
+    private String sentence; // 선고
+
+    private String courtName; // 법원명
+
+    private String courtTypeCode; // 법원종류코드
+
+    private String caseTypeName; // 사건종류명
+
+    private String caseTypeCode; // 사건종류코드
+
+    private String typeOfJudgment; // 판결유형
+
+    @Lob
+    @Column(columnDefinition = "LONGTEXT")
+    private String notice; // 판시사항
+
+    @Lob
+    @Column(columnDefinition = "LONGTEXT")
+    private String summaryOfTheJudgment; // 판결요지
+
+    @Lob
+    @Column(columnDefinition = "LONGTEXT")
+    private String referenceArticle; // 참조조문
+
+    @Lob
+    @Column(columnDefinition = "LONGTEXT")
+    private String referencePrecedent; // 참조판례
+
+    @Lob
+    @Column(columnDefinition = "LONGTEXT")
+    private String precedentContent; // 판례내용
+}

infra/main.tf

@@ -228,6 +228,15 @@ docker run -d \
   -v /dockerProjects/npm_1/volumes/etc/letsencrypt:/etc/letsencrypt \
   jc21/nginx-proxy-manager:latest
 
+# redis 설치
+docker run -d \
+  --name=redis_1 \
+  --restart unless-stopped \
+  --network common \
+  -p 6379:6379 \
+  -e TZ=Asia/Seoul \
+  redis --requirepass ${var.password_1}
+
 # mysql 설치
 docker run -d \
   --name mysql_1 \