woowacourse-teams
diff --git a/‎README.md‎
Lines changed: 58 additions & 10 deletions b/‎README.md‎
Lines changed: 58 additions & 10 deletions
diff --git a/‎backend/pick-git/.gitignore‎
Lines changed: 4 additions & 0 deletions b/‎backend/pick-git/.gitignore‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎backend/pick-git/build.gradle‎
Lines changed: 58 additions & 32 deletions b/‎backend/pick-git/build.gradle‎
Lines changed: 58 additions & 32 deletions
diff --git a/‎backend/pick-git/security‎ b/‎backend/pick-git/security‎
diff --git a/‎backend/pick-git/src/docs/asciidoc/comment.adoc‎
Lines changed: 2 additions & 2 deletions b/‎backend/pick-git/src/docs/asciidoc/comment.adoc‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎backend/pick-git/src/docs/asciidoc/following.adoc‎
Lines changed: 2 additions & 2 deletions b/‎backend/pick-git/src/docs/asciidoc/following.adoc‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎backend/pick-git/src/docs/asciidoc/index.adoc‎
Lines changed: 2 additions & 0 deletions b/‎backend/pick-git/src/docs/asciidoc/index.adoc‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎backend/pick-git/src/docs/asciidoc/portfolio.adoc‎
Lines changed: 57 additions & 0 deletions b/‎backend/pick-git/src/docs/asciidoc/portfolio.adoc‎
Lines changed: 57 additions & 0 deletions
@@ -2,35 +2,83 @@
     <img src="https://user-images.githubusercontent.com/50176238/129131809-52307863-7d29-4ebf-8595-46ef77ba2be8.png" alt="pick-git-logo" width="220" height="220">
 </p>
 
+<div align="center">
+
+  💻 Github Repo 기반 개발 장려 SNS, <br>
+  🖋 [깃-들다 (Pick-Git)](https://pick-git.com/)
+
+</div>
+<br/>
+
+<div align="center">
+
+[![Application](http://img.shields.io/badge/Application-fc3465?style=flat&logo=github&logoColor=white&link=https://pick-git.com/)](https://pick-git.com/)
+[![Tech Blog](http://img.shields.io/badge/-Tech%20Blog-important?style=flat&logo=dev.to&logoColor=white&link=https://2021-pick-git.github.io/)](https://2021-pick-git.github.io/)
+[![WIKI](http://img.shields.io/badge/-GitHub%20WiKi-395FC1?style=flat&logo=dev.to&logoColor=white&link=https://github.com/woowacourse-teams/2021-pick-git/wiki)](https://github.com/woowacourse-teams/2021-pick-git/wiki)
+[![Release](https://img.shields.io/github/v/release/woowacourse-teams/2021-pick-git?color=skyblue)](https://github.com/woowacourse-teams/2021-pick-git/releases/tag/v1.2.0)
+
+</div>
+<br/>
+
+## 💻 깃-들다 (Pick-Git)
+
+|소셜 로그인|게시물 작성|프로필 및 활동 통계 조회|
+|:-:|:-:|:-:|
+|<img src=https://user-images.githubusercontent.com/56240505/135817249-985f31ac-cde3-431e-b16d-56cfecb2897e.gif>|<img src=https://user-images.githubusercontent.com/56240505/135817222-fb893165-18cf-4ef5-b240-eb292a318ca7.gif>|<img src=https://user-images.githubusercontent.com/56240505/135817239-a267f424-fa9d-473a-8010-e9e6232db8b9.gif>|
+|<b>유저 검색 및 팔로우</b>|<b>게시물 검색</b>|<b>포트폴리오</b>|
+|<img src=https://user-images.githubusercontent.com/56240505/135817233-243ebc51-70c2-4613-b76e-7edc4aaf0667.gif>|<img src=https://user-images.githubusercontent.com/56240505/135817748-25771911-1f98-437f-a956-8b53f626d9e8.gif>|<img src=https://user-images.githubusercontent.com/56240505/135817760-ac932970-c5ab-4c95-81da-cc6533f19f17.gif>|
+
 <p align="center">
-  💻 Github Repo 기반 개발 장려 SNS,<br/>
-  🖋 깃-들다 (pick-git)
+    <b>깃-들다</b>는 Github 기반의 SNS로서 <b>개발자의 자기 PR과 소통을 위한 공간</b>입니다.<br><br>
+    <a href=https://sites.google.com/woowahan.com/wooteco-demo-3rd/%EA%B9%83-%EB%93%A4%EB%8B%A4?authuser=0>우아한테크코스 데모데이 소개 사이트에서 동영상 등 더 많은 내용을 확인해보세요.</a>
 </p>
+<br/>
+
+## 🛠 Tech Stacks
+
+### Frontend
 
+![frontend_tech_stacks](https://user-images.githubusercontent.com/50176238/135874567-f03612e6-9e2e-4553-9e91-c39b79935817.png)
+
+> <b>깃-들다</b>의 <b>프론트엔드</b>에 대해 더 자세하게 알고싶다면, [기술 블로그](https://2021-pick-git.github.io/) 또는 [GitHub WiKi - FE 중점 사항](https://github.com/woowacourse-teams/2021-pick-git/wiki/FE-%EC%A4%91%EC%A0%90-%EC%82%AC%ED%95%AD)을 참고해주세요.
+<br/>
+
+### Backend
+
+![backend_tech_stacks](https://user-images.githubusercontent.com/56240505/137877225-07cbf85b-053d-4610-9164-1261b08ae047.png)
+
+> <b>깃-들다</b>의 <b>백엔드</b>에 대해 더 자세하게 알고싶다면, [기술 블로그](https://2021-pick-git.github.io/) 또는 [GitHub WiKi - BE 중점 사항](https://github.com/woowacourse-teams/2021-pick-git/wiki/BE-%EC%A4%91%EC%A0%90-%EC%82%AC%ED%95%AD)을 참고해주세요.
 <br/>
 
-## 깃-들다 (pick-git)
-- [웹 사이트](https://pick-git.com/)
-- [기술 블로그](https://2021-pick-git.github.io/)
+## 🔌 Infrastructures
+
+![prod_environment](https://user-images.githubusercontent.com/56240505/137874986-81cd5840-8b69-4b4d-8b89-b1b3d8d08341.png)
+![pipeline](https://user-images.githubusercontent.com/56240505/137875149-090f90b7-bc17-47d4-b881-3a88888d4b32.png)
+
+> <b>깃-들다</b>의 <b>인프라</b>에 대해 더 자세하게 알고싶다면, [Pick-Git의 Infrasturcture](https://2021-pick-git.github.io/infrastructure/) 글을 참고해주세요.
 
 <br/>
 
-## Members
-### FE
+## 🏠 Members
+
+### Frontend
+
 |브콜|크리스|
 |:-:|:--:|
 |<img src="https://avatars.githubusercontent.com/u/57767891?v=4" alt="beucol" width="100" height="100">|<img src="https://avatars.githubusercontent.com/u/32982670?v=4" alt="chris" width="100" height="100">|
 |[Tanney-102](https://github.com/Tanney-102)|[swon3210](https://github.com/swon3210)|
 
-### BE
+### Backend
+
 |다니|마크|손너잘|코다|케빈|
 |:-:|:-:|:--:|:-:|:-:|
 |<img src="https://avatars0.githubusercontent.com/u/50176238?s=400&u=212ca9ffd06b88465746a94eaa6f88b10485497d&v=4" alt="daeun" width="100" height="100">|<img src="https://avatars.githubusercontent.com/u/56860124?v=4" alt="mark" width="100" height="100">|<img src="https://avatars.githubusercontent.com/u/33603557?v=4" alt="neozal" width="100" height="100">|<img src="https://avatars.githubusercontent.com/u/63405904?v=4" alt="koda" width="100" height="100">|<img src="https://avatars.githubusercontent.com/u/56240505?v=4" alt="kevin" width="100" height="100">|
 |[da-nyee](https://github.com/da-nyee)|[binghe819](https://github.com/binghe819)|[bperhaps](https://github.com/bperhaps)|[yjksw](https://github.com/yjksw)|[xlffm3](https://github.com/xlffm3)|
 
-<br/>
+<br>
+
+## 🌈 Culture
 
-## Culture
 <p align="center">
   <img src="https://user-images.githubusercontent.com/50176238/129133023-8492948f-01e4-45b7-91c4-fd556d3dc326.png" alt="pick-git-cultures" width="520" height="360">
 </p>
@@ -38,7 +38,11 @@ out/
 
 ### Submodule ###
 src/main/resources/application-security.yml
+src/main/resources/application-dev.yml
 src/main/resources/application-prod.yml
+src/main/resources/application-db.yml
+src/main/resources/application-local.yml
+src/main/resources/application-staging.yml
 
 ### REST Docs ###
 src/main/resources/static/docs/
 
@@ -14,77 +14,85 @@ repositories {
     mavenCentral()
 }
 
+ext {
+    snippetsDir = file('build/generated-snippets')
+}
+
 dependencies {
     implementation 'io.jsonwebtoken:jjwt:0.9.1'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.data:spring-data-elasticsearch:4.2.2'
+    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-log4j2'
+    implementation 'com.lmax:disruptor:3.4.2'
+    implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'org.apache.httpcomponents:httpclient:4.5'
     implementation 'net.rakugakibox.spring.boot:logback-access-spring-boot-starter:2.7.1'
     implementation 'org.reflections:reflections:0.9.10'
+    implementation 'org.flywaydb:flyway-core:6.4.2'
+    implementation 'org.springframework.boot:spring-boot-starter-cache:2.5.4'
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis:2.5.4'
+    implementation ('it.ozimov:embedded-redis:0.7.3') {
+        exclude group: 'org.slf4j', module: 'slf4j-simple'
+    }
 
     compileOnly 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.4'
+    compileOnly 'org.projectlombok:lombok:1.18.20'
 
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
 
     asciidoctor 'org.springframework.restdocs:spring-restdocs-asciidoctor:1.2.6.RELEASE'
 
-    compileOnly 'org.projectlombok:lombok:1.18.20'
     annotationProcessor 'org.projectlombok:lombok:1.18.20'
-
-    testCompileOnly 'org.projectlombok:lombok:1.18.20'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
+    annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
 
     testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.rest-assured:rest-assured:4.4.0'
-}
 
-processResources.dependsOn('copySecurity')
-processResources.dependsOn('copyProd')
+    testCompileOnly 'org.projectlombok:lombok:1.18.20'
 
-task copySecurity(type: Copy) {
-    from './security/application-security.yml'
-    into './src/main/resources'
-}
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.20'
 
-task copyProd(type: Copy) {
-    from './security/application-prod.yml'
-    into './src/main/resources'
+    modules {
+        module("org.springframework.boot:spring-boot-starter-logging") {
+            replacedBy("org.springframework.boot:spring-boot-starter-log4j2", "Use Log4j2 instead of Logback")
+        }
+    }
 }
 
 test {
     useJUnitPlatform()
 }
 
-ext {
-    snippetsDir = file('build/generated-snippets')
+processResources.dependsOn('copySubmodule')
+
+task copySubmodule(type: Copy) {
+    from './security'
+    include '*.yml'
+    into './src/main/resources'
 }
 
 asciidoctor {
-    dependsOn test
-
     inputs.dir snippetsDir
+    finalizedBy 'copyRestDocs'
 }
 
-bootJar {
-    dependsOn asciidoctor
-
-    copy {
-        from 'build/asciidoc/html5'
-        into 'src/main/resources/static/docs'
-        include '*.html'
-    }
+task copyRestDocs(type: Copy) {
+    dependsOn('asciidoctor')
+    from 'build/asciidoc/html5'
+    include '*.html'
+    into 'src/main/resources/static/docs'
 }
 
 jacoco {
     toolVersion = "0.8.5"
 }
 
 jacocoTestReport {
-    dependsOn bootJar
-
     reports {
         html.enabled true
         xml.enabled true
@@ -107,7 +115,15 @@ jacocoTestReport {
                             '**/*OAuthClient*',
                             '**/common*',
                             '**/format*',
-                            '**/*S3*'
+                            '**/*Exception*',
+                            '**/*Content*',
+                            '**/content*',
+                            '**/*S3*',
+                            '**/*DataSource*',
+                            '**/*Slave*',
+                            '**/*Elastic*',
+                            '**/*GithubContributionExtractor*',
+                            '**/*Configuration*'
                     ])
         }))
     }
@@ -122,9 +138,9 @@ jacocoTestCoverageVerification {
             element = 'CLASS'
 
             limit {
-                counter = 'METHOD'
+                counter = 'CLASS'
                 value = 'COVEREDRATIO'
-                minimum = 0.65
+                minimum = 0.70
             }
 
             excludes = [
@@ -138,8 +154,18 @@ jacocoTestCoverageVerification {
                     '**.*OAuthClient*',
                     '**.*Interceptor*',
                     '**.*Exception*',
-                    '**.*Storage*'
+                    '**.*Content*',
+                    '**.*Storage*',
+                    '**.*DataSource*',
+                    '**.*Slave*',
+                    '**.*Elastic*',
+                    '**.*GithubContributionExtractor*',
+                    '**.*Configuration*'
             ]
         }
     }
 }
+
+bootRun {
+    args = ["--spring.profiles.active=local"]
+}
@@ -22,9 +22,9 @@ include::{snippets}/comment-post-emptyContent/http-response.adoc[]
 
 === 댓글 요청 - 사용자
 ==== Request
-include::{snippets}/comment-queryComments/http-request.adoc[]
+include::{snippets}/comment-queryComments-user/http-request.adoc[]
 ==== Response
-include::{snippets}/comment-queryComments/http-response.adoc[]
+include::{snippets}/comment-queryComments-user/http-response.adoc[]
 
 === 댓글 요청 - 게스트
 ==== Request
 
@@ -7,7 +7,7 @@ endif::[]
 :toc: left
 :toclevels: 4
 
-== Authorization
+== Following
 === 팔로잉 요청 - 로그인
 ==== Request
 include::{snippets}/following-LoggedIn/http-request.adoc[]
@@ -30,4 +30,4 @@ include::{snippets}/following-unLoggedIn/http-response.adoc[]
 ==== Request
 include::{snippets}/unfollowing-unLoggedIn/http-request.adoc[]
 ==== Response
-include::{snippets}/unfollowing-unLoggedIn/http-response.adoc[]
+include::{snippets}/unfollowing-unLoggedIn/http-response.adoc[]
@@ -11,8 +11,10 @@ include::authorization.adoc[]
 include::comment.adoc[]
 include::following.adoc[]
 include::post.adoc[]
+include::postfeed.adoc[]
 include::profile.adoc[]
 include::tag.adoc[]
 include::search.adoc[]
+include::portfolio.adoc[]
 
 PickGit API
@@ -0,0 +1,57 @@
+ifndef::snippets[]
+:snippets: ../../../build/generated-snippets
+endif::[]
+:doctype: book
+:icons: font
+:source-highlighter: highlightjs
+:toc: left
+:toclevels: 4
+
+== Portfolio
+=== 나의 포트폴리오 조회 - 사용자 (로그인)
+==== Request
+include::{snippets}/portfolio-readMine-loggedIn/http-request.adoc[]
+==== Response
+include::{snippets}/portfolio-readMine-loggedIn/http-response.adoc[]
+
+=== 남의 포트폴리오 조회, 존재하는 경우 - 사용자 (로그인)
+==== Request
+include::{snippets}/portfolio-readYoursWithExisting-loggedIn/http-request.adoc[]
+==== Response
+include::{snippets}/portfolio-readYoursWithExisting-loggedIn/http-response.adoc[]
+
+=== 남의 포트폴리오 조회, 존재하지 않는 경우 - 사용자 (로그인)
+==== Request
+include::{snippets}/portfolio-readYoursWithNotExisting-loggedIn/http-request.adoc[]
+==== Response
+include::{snippets}/portfolio-readYoursWithNotExisting-loggedIn/http-response.adoc[]
+
+=== 나의 포트폴리오 수정 - 사용자 (로그인)
+==== Request
+include::{snippets}/portfolio-updateMine-loggedIn/http-request.adoc[]
+==== Response
+include::{snippets}/portfolio-updateMine-loggedIn/http-response.adoc[]
+
+=== 남의 포트폴리오 수정 - 사용자 (로그인)
+==== Request
+include::{snippets}/portfolio-updateYours-loggedIn/http-request.adoc[]
+==== Response
+include::{snippets}/portfolio-updateYours-loggedIn/http-response.adoc[]
+
+=== 남의 포트폴리오 조회, 존재하는 경우 - 게스트 (비 로그인)
+==== Request
+include::{snippets}/portfolio-readYoursWithExisting-unLoggedIn/http-request.adoc[]
+==== Response
+include::{snippets}/portfolio-readYoursWithExisting-unLoggedIn/http-response.adoc[]
+
+=== 남의 포트폴리오 조회, 존재하지 않는 경우 - 게스트 (비 로그인)
+==== Request
+include::{snippets}/portfolio-readYoursWithNotExisting-unLoggedIn/http-request.adoc[]
+==== Response
+include::{snippets}/portfolio-readYoursWithNotExisting-unLoggedIn/http-response.adoc[]
+
+=== 남의 포트폴리오 수정 - 게스트 (비 로그인)
+==== Request
+include::{snippets}/portfolio-updateYours-unLoggedIn/http-request.adoc[]
+==== Response
+include::{snippets}/portfolio-updateYours-unLoggedIn/http-response.adoc[]