Merge branch 'develop'

woowacourse-teams · Oct 15, 2021 · 611865b · 611865b
2 parents 6742b28 + fe51b00
commit 611865b
Show file tree

Hide file tree

Showing 148 changed files with 2,387 additions and 14,646 deletions.
diff --git a/.github/workflows/front-main-deploy.yml b/.github/workflows/front-main-deploy.yml
@@ -0,0 +1,31 @@
+name: front-main-deploy
+
+on:
+  push: # 적용될 액션
+    branches: main # 적용될 브랜치
+    paths:
+      - "frontend/**" # workflow에서 적용될 path
+
+defaults:
+  run:
+    working-directory: ./frontend # workflow에서 default working directory
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest # 인스턴스 OS
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v2 # 워크플로에서 액세스할 수 있도록 에서 저장소를 체크아웃
+
+      - name: Install Dependencies
+        run: yarn
+
+      - name: Build
+        run: yarn build
+
+      - name: S3 Deploy
+        run: aws s3 sync ./dist s3://2021-cvi/ --acl bucket-owner-full-control # s3 이름 2021-cvi
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: ${{ secrets.AWS_REGION }}
diff --git a/README.md b/README.md
@@ -1,2 +1,193 @@
-# 백중원(백신 중앙 정보원)
+<img src="https://user-images.githubusercontent.com/53412998/135798025-1158fe48-0841-4545-a28f-8015468c3328.png" width="100%"/>
 
+# 프로젝트 소개
+
+<br/>
+
+<p align="center">
+  <a target="_blank" href="https://www.youtube.com/watch?v=W1LziOGs_6g">
+    <img src="https://user-images.githubusercontent.com/53412998/137051501-805cd497-b7d7-421e-b6ac-4f03549e0d93.png" width="50%" height="50%">
+    <p align="center">(클릭하면 영상을 실행할 수 있습니다)</p>
+  </a>
+</p>
+
+<br/>
+
+코로나19 백신 접종 후기를 남기다! 우리는 [`Team CVI`](https://vaccine-review.com) 입니다.
+
+- [`CVI`](https://vaccine-review.com) 는 코로나19 백신 정보를 제공해줘요.
+- [`CVI`](https://vaccine-review.com) 에서는 백신 후기를 남길 수 있어요.
+- 부작용이 걱정되신다구요? [`다른 사람들의 후기를 보러 가볼까요? :)`](https://vaccine-review.com)
+
+서비스 URL: https://vaccine-review.com
+
+<br/>
+
+# 서비스 기능
+## 간단 요약
+![간단 요약](https://user-images.githubusercontent.com/53412998/135582980-53157888-c54d-4313-bff5-e06ccd01274f.gif)
+
+<details>
+<summary>소셜 로그인</summary>
+  <img src="https://user-images.githubusercontent.com/53412998/135583011-4fd322c9-623a-4329-ae95-7ec4fa23fe37.gif"/>
+</details>
+
+
+<details>
+<summary>글 작성</summary>
+  <img src="https://user-images.githubusercontent.com/53412998/135581550-d38306bc-7ff3-4771-85e1-23cb20c79550.gif"/>
+</details>
+
+<details>
+<summary>좋아요 누르기, 댓글 작성</summary>
+  <img src="https://user-images.githubusercontent.com/53412998/135583033-adf9ee08-0846-4b0e-bf21-c3d22b0615b7.gif"/>
+</details>
+
+<details>
+<summary>게시글 필터링, 정렬</summary>
+  <img src="https://user-images.githubusercontent.com/53412998/135583001-e819f4d0-9c35-4f37-a53e-1996522450d4.gif"/>
+</details>
+
+<details>
+<summary>마이페이지</summary>
+  <img src="https://user-images.githubusercontent.com/53412998/135583010-b5a8757d-2eb5-4a19-b6e2-c0b507a69e13.gif"/>
+</details>
+
+<details>
+<summary>접종 현황 통계</summary>
+  <img src="https://user-images.githubusercontent.com/53412998/135583019-990a80aa-e9e3-4046-85e4-ea930fc1febb.gif"/>
+</details>
+
+<br/>
+
+# 우리팀의 강점
+
+<!-- [자세한 문서화를 했어요.](https://www.notion.so/4b6587fb182447eb93183d6160b5ef0a) -->
+
+[애자일하게 서비스를 개발했어요.](https://www.notion.so/da2fc7e8d99f4f4484bad58ed2e1b233)
+
+[우리만의 팀 문화를 만들었어요.](https://www.notion.so/ccf25ce39e2d42389c43ccf9b768b53b)
+
+<br/>
+
+# 기술 스택
+<img width="100%" src="https://user-images.githubusercontent.com/40762111/135794163-9c4978df-7ac3-4a17-a97e-8dd3afe64533.png" />
+
+<br/>
+
+# 서비스아키텍처
+
+##  사용자 요청 시나리오 (요청부터 응답까지)
+![FE+BE](https://user-images.githubusercontent.com/43339385/135794655-511b9a4b-ce99-41ca-a003-d549b1e3f20a.png)
+
+## 프로트엔드 아키텍쳐
+![FE_CI:CD](https://user-images.githubusercontent.com/43339385/135794087-571dea0c-c90f-42c3-b8cf-b08130ea0d39.png)
+
+
+##  백엔드 인프라 아키텍처
+![image](https://user-images.githubusercontent.com/48986787/135793839-08fc58d6-c381-4af3-be58-16342d8ff5bb.png)
+
+
+## 백엔드 CI / CD    
+![image](https://user-images.githubusercontent.com/48986787/135793875-193bc33a-31fd-414a-ac1c-4591e44086cf.png)
+
+<br/>
+
+# 팀원 소개
+<table>
+  <tr>
+    <td colspan="2" align="center"><strong>Front-end</strong></td>
+    <td colspan="4" align="center"><strong>Back-end</strong></td>
+  </tr>
+  <tr>
+    <td align="center">
+      <a href="https://github.com/HyuuunjuKim">
+        <img src="https://user-images.githubusercontent.com/67272922/135793917-03a2d388-eab0-4b5d-87cf-c4066a441c1d.png" width="100px;" alt=""/><br />
+        <sub>
+          <b>엘라(김현주)</b>
+        </sub>
+      </a><br />
+    </td>
+    <td align="center">
+      <a href="https://github.com/jum0">
+        <img src="https://user-images.githubusercontent.com/67272922/135793929-2f635802-8cc6-4645-937f-d59c8dc85356.png" width="100px;" alt=""/><br />
+        <sub>
+          <b>주모(한준모)</b>
+        </sub>
+      </a><br />
+    </td>
+    <td align="center">
+      <a href="https://github.com/livenow14">
+        <img src="https://user-images.githubusercontent.com/67272922/135793762-8104fdda-d777-4f3a-b514-14b60d5dd6be.png" width="100px;" alt=""/>
+        <br />
+        <sub>
+          <b>검프(김태정)</b>
+        </sub>
+      </a><br />
+    </td>
+    <td align="center">
+      <a href="https://github.com/younghoonkwon">
+        <img src="https://user-images.githubusercontent.com/67272922/135793840-d9e4f3d7-d68e-46ef-b54c-374fe46fb85d.png" width="100px;" alt=""/><br />
+        <sub>
+          <b>라이언(권영훈)</b>
+        </sub>
+      </a><br />
+    </td>
+    <td align="center">
+      <a href="https://github.com/thisisyoungbin">
+        <img src="https://user-images.githubusercontent.com/67272922/135793855-a428ba5f-83e4-459b-9ebf-e20da7f8b98b.png" width="100px;" alt=""/><br />
+        <sub>
+          <b>욘(김영빈)</b>
+        </sub>
+      </a><br />
+    </td>
+    <td align="center">
+      <a href="https://github.com/taehee-kim-dev">
+        <img src="https://user-images.githubusercontent.com/67272922/135793886-e137d43e-00ad-4d4d-af28-a45abe99f4ee.png" width="100px;" alt=""/><br />
+        <sub>
+          <b>인비(김태희)</b>
+        </sub>
+      </a><br />
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="1" align="center">
+      <a href="https://github.com/woowacourse-teams/2021-cvi/issues?q=assignee%3AHyuuunjuKim" title="Code">issues</a>
+    </td>
+    <td rowspan="1" align="center">
+      <a href="https://github.com/woowacourse-teams/2021-cvi/issues?q=assignee%3Ajum0" title="Code">issues</a>
+    </td>
+    <td rowspan="1" align="center">
+      <a href="https://github.com/woowacourse-teams/2021-cvi/issues?q=assignee%3Alivenow14" title="Code">issues</a>
+    </td>
+    <td rowspan="1" align="center">
+      <a href="https://github.com/woowacourse-teams/2021-cvi/issues?q=assignee%3Ayounghoonkwon" title="Code">issues</a>
+    </td>
+    <td rowspan="1" align="center">
+      <a href="https://github.com/woowacourse-teams/2021-cvi/issues?q=assignee%3Athisisyoungbin" title="Code">issues</a>
+    </td>
+    <td rowspan="1" align="center">
+      <a href="https://github.com/woowacourse-teams/2021-cvi/issues?q=assignee%3Ataehee-kim-dev" title="Code">issues</a>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="1" align="center">
+      <a href="https://github.com/woowacourse-teams/2021-cvi/commits?author=HyuuunjuKim" title="Code">commits</a>
+    </td>
+    <td rowspan="1" align="center">
+      <a href="https://github.com/woowacourse-teams/2021-cvi/commits?author=jum0" title="Code">commits</a>
+    </td>
+    <td rowspan="1" align="center">
+      <a href="https://github.com/woowacourse-teams/2021-cvi/commits?author=livenow14" title="Code">commits</a>
+    </td>
+    <td rowspan="1" align="center">
+      <a href="https://github.com/woowacourse-teams/2021-cvi/commits?author=younghoonkwon" title="Code">commits</a>
+    </td>
+    <td rowspan="1" align="center">
+      <a href="https://github.com/woowacourse-teams/2021-cvi/commits?author=thisisyoungbin" title="Code">commits</a>
+    </td>
+    <td rowspan="1" align="center">
+      <a href="https://github.com/woowacourse-teams/2021-cvi/commits?author=taehee-kim-dev" title="Code">commits</a>
+    </td>
+  </tr>
+</table>
diff --git a/backend/.gitignore b/backend/.gitignore
@@ -38,12 +38,3 @@ out/
 
 # QueryDSL
 /backend/src/main/generated/
-
-# db
-/src/main/resources/application-db.yml
-
-# jwt
-/src/main/resources/application-jwt.yml
-
-# client-secret
-/src/main/resources/application-client-secret.yml
diff --git a/backend/app-cvi-api/docs/asciidoc/index.adoc → .../app-cvi-api/src/docs/asciidoc/index.adoc b/backend/app-cvi-api/docs/asciidoc/index.adoc → .../app-cvi-api/src/docs/asciidoc/index.adoc
@@ -575,3 +575,5 @@ include::{snippets}/comment-delete/http-response.adoc[]
 ===== Request
 include::{snippets}/comment-delete-failure/http-request.adoc[]
 
+===== Response
+include::{snippets}/comment-delete-failure/http-response.adoc[]
diff --git a/backend/app-cvi-api/src/main/java/com/cvi/controller/PostController.java b/backend/app-cvi-api/src/main/java/com/cvi/controller/PostController.java
@@ -43,9 +43,8 @@ public List<PostResponse> findByVaccineTypeAndPaging(@RequestParam(defaultValue
                                                          @RequestParam(defaultValue = "0") int offset,
                                                          @RequestParam(defaultValue = "6") int size,
                                                          @RequestParam(defaultValue = "CREATED_AT_DESC") Sort sort,
-                                                         @RequestParam(defaultValue = "500") int fromHoursBefore,
                                                          @AuthenticationPrincipal Optional<User> user) {
-        return postService.findByVaccineType(vaccinationType, offset, size, sort, fromHoursBefore, user);
+        return postService.findByVaccineType(vaccinationType, offset, size, sort, user);
     }
 
     @GetMapping("/{id}")

diff --git a/backend/app-cvi-api/src/main/java/com/cvi/service/post/PostService.java b/backend/app-cvi-api/src/main/java/com/cvi/service/post/PostService.java
@@ -107,8 +107,8 @@ public List<PostResponse> findByVaccineType(VaccinationType vaccinationType, Opt
         return PostResponse.toList(posts, optionalUser.orElse(null));
     }
 
-    public List<PostResponse> findByVaccineType(VaccinationType vaccinationType, int offset, int size, Sort sort, int hours, Optional<User> optionalUser) {
-        List<Post> posts = postRepository.findByVaccineType(vaccinationType, offset, size, Sort.toOrderSpecifier(sort), hours);
+    public List<PostResponse> findByVaccineType(VaccinationType vaccinationType, int offset, int size, Sort sort, Optional<User> optionalUser) {
+        List<Post> posts = postRepository.findByVaccineType(vaccinationType, offset, size, Sort.toOrderSpecifier(sort));
         return PostResponse.toList(posts, optionalUser.orElse(null));
     }
 

diff --git a/backend/app-cvi-api/src/test/java/com/cvi/controller/PostControllerTest.java b/backend/app-cvi-api/src/test/java/com/cvi/controller/PostControllerTest.java
@@ -196,7 +196,7 @@ void findByVaccineTypePaging() throws Exception {
             new PostResponse(37L, userResponse, "이건 내용입니다.2", 200, 20, 4, false, VaccinationType.PFIZER, LocalDateTime.now().minusDays(1), imageUrls),
             new PostResponse(36L, userResponse, "이건 내용입니다.3", 300, 30, 2, true, VaccinationType.PFIZER, LocalDateTime.now().minusDays(2), imageUrls)
         ));
-        willReturn(postResponses).given(postService).findByVaccineType(any(VaccinationType.class), anyInt(), anyInt(), any(), anyInt(), any());
+        willReturn(postResponses).given(postService).findByVaccineType(any(VaccinationType.class), anyInt(), anyInt(), any(), any());
         //when
         ResultActions response = 글_타입별_페이징_조회_요청(VaccinationType.PFIZER, 0, 3);
         //then
@@ -208,7 +208,7 @@ void findByVaccineTypePaging() throws Exception {
     void findByVaccineTypePagingWhenPostsIsEmpty() throws Exception {
         //given
         List<PostResponse> postResponse = Collections.emptyList();
-        willReturn(postResponse).given(postService).findByVaccineType(any(VaccinationType.class), anyInt(), anyInt(), any(), anyInt(), any());
+        willReturn(postResponse).given(postService).findByVaccineType(any(VaccinationType.class), anyInt(), anyInt(), any(), any());
         //when
         ResultActions response = 글_타입별_페이징_조회_요청(VaccinationType.PFIZER, 0, 3);
         //then
@@ -224,7 +224,7 @@ void findByVaccineTypeSorting() throws Exception {
             new PostResponse(37L, userResponse, "이건 내용입니다.2", 200, 20, 8, false, VaccinationType.PFIZER, LocalDateTime.now().minusDays(1), imageUrls),
             new PostResponse(146L, userResponse, "이건 내용입니다.3", 300, 30, 1, true, VaccinationType.PFIZER, LocalDateTime.now().minusDays(2), imageUrls)
         ));
-        willReturn(postResponses).given(postService).findByVaccineType(any(VaccinationType.class), anyInt(), anyInt(), any(), anyInt(), any());
+        willReturn(postResponses).given(postService).findByVaccineType(any(VaccinationType.class), anyInt(), anyInt(), any(), any());
         //when
         ResultActions response = 글_타입별_정렬_조회_요청(VaccinationType.PFIZER, Sort.LIKE_COUNT_ASC);
         //then
@@ -240,7 +240,7 @@ void findByVaccineTypeHourFiltering() throws Exception {
             new PostResponse(37L, userResponse, "이건 내용입니다.2", 200, 20, 6, false, VaccinationType.PFIZER, LocalDateTime.now().minusHours(3), imageUrls),
             new PostResponse(146L, userResponse, "이건 내용입니다.3", 300, 30, 7, true, VaccinationType.PFIZER, LocalDateTime.now().minusHours(5), imageUrls)
         ));
-        willReturn(postResponses).given(postService).findByVaccineType(any(VaccinationType.class), anyInt(), anyInt(), any(), anyInt(), any());
+        willReturn(postResponses).given(postService).findByVaccineType(any(VaccinationType.class), anyInt(), anyInt(), any(), any());
         //when
         ResultActions response = 글_타입별_시간필터링_조회_요청(VaccinationType.PFIZER, 24);
         //then