chore: application.yml의 profile을 prod로 수정 (#59)

* chore: Certbot 컨테이너 삭제 * chore: application.yml을 수정 * chore: 깃허브 액션 플로우 수정 * fix: Post Id 반환되도록 수정 * feat: nginx 포트 죽이기
KHUMON-EDU · Nov 16, 2023 · 982f3e8 · 982f3e8
1 parent 758fc33
commit 982f3e8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -13,7 +13,7 @@ on:
     types: [closed]
   #특정 브렌치에 대하여 설정
   push:
-    branches : ["feat/34-test-deploy", "feat/36-nginx", "feat/51-deploy-ec2"]
+    branches : ["feat/34-test-deploy", "feat/36-nginx", "feat/51-deploy-ec2", "feat/57-certbot-remove"]
   workflow_dispatch:
 
 
@@ -79,6 +79,7 @@ jobs:
           password: ${{ secrets.EC2_SECRET }}
           script: |
             sh ~/deploy.sh
+            sh ~/nginxstop.sh
             sudo docker stop $(sudo docker ps -a -q)
             sudo docker rm $(sudo docker ps -a -q)
             sudo docker rmi $(sudo docker images -q)

diff --git a/src/main/java/com/teamh/khumon/dto/LearningMaterialContent.java b/src/main/java/com/teamh/khumon/dto/LearningMaterialContent.java
@@ -12,7 +12,7 @@
 @ToString
 @Builder
 public class LearningMaterialContent {
-
+    private Long id;
     private String title;
     private String content;
     private LocalDateTime createAt;

diff --git a/src/main/java/com/teamh/khumon/service/LearningMaterialService.java b/src/main/java/com/teamh/khumon/service/LearningMaterialService.java
@@ -126,6 +126,7 @@ public ResponseEntity<?> getLearningMaterials(Principal principal, Pageable page
         Member member = memberRepository.findByUsername(principal.getName()).orElseThrow();
         Page<LearningMaterial> learningMaterials = learningMaterialRepository.findByMemberIdAndTitleContainingOrContentContaining(member.getId(), search, search, pageable);
         List<LearningMaterialContent> learningMaterialContents = learningMaterials.getContent().stream().map(learningMaterial -> LearningMaterialContent.builder()
+                .id(learningMaterial.getId())
                 .title(learningMaterial.getTitle())
                 .content(learningMaterial.getContent())
                 .createAt(learningMaterial.getCreatedAt())