Skip to content

Commit

Permalink
Merge pull request #662 from woowacourse-teams/develop
Browse files Browse the repository at this point in the history
[release] v1.0.2
  • Loading branch information
summerlunaa authored Sep 22, 2022
2 parents 9db5a87 + 4e7fda5 commit 0665ecc
Show file tree
Hide file tree
Showing 171 changed files with 3,612 additions and 3,934 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/backend-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,3 @@ jobs:
if: always()
with:
junit_files: ${{ github.workspace }}/backend/build/test-results/**/*.xml

- name: Add coverage to PR
id: jacoco
uses: madrapps/[email protected]
with:
paths: ${{ github.workspace }}/backend/build/jacoco/index.xml
token: ${{ secrets.GITHUB_TOKEN }}

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

달력이 기록을 공유할 때, 달록 🌙

[<img src="https://img.shields.io/badge/-dallog.me-important?style=flat&logo=google-chrome&logoColor=white" />](https://dallog.me) [<img src="https://img.shields.io/badge/-tech blog-blue?style=flat&logo=google-chrome&logoColor=white" />](https://dallog.github.io) [<img src="https://img.shields.io/badge/release-v0.1.2-critical?style=flat&logo=google-chrome&logoColor=white" />](https://github.com/woowacourse-teams/2022-dallog/releases/tag/v0.1.2)
[<img src="https://img.shields.io/badge/-dallog.me-important?style=flat&logo=google-chrome&logoColor=white" />](https://dallog.me) [<img src="https://img.shields.io/badge/-tech blog-blue?style=flat&logo=google-chrome&logoColor=white" />](https://dallog.github.io) [<img src="https://img.shields.io/badge/release-v1.0.2-critical?style=flat&logo=google-chrome&logoColor=white" />](https://github.com/woowacourse-teams/2022-dallog/releases/tag/v1.0.2)

[](https://dallog.me)

Expand Down
1 change: 0 additions & 1 deletion backend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ repositories {
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-jdbc'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-starter-web'
Expand Down
50 changes: 21 additions & 29 deletions backend/src/docs/asciidoc/auth.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,50 @@

=== OAuth 로그인 링크 생성

==== Request
==== HTTP Request

include::{snippets}/auth/link/http-request.adoc[]
include::{snippets}/auth/generateLink/http-request.adoc[]

==== Path Parameters

include::{snippets}/auth/link/path-parameters.adoc[]
include::{snippets}/auth/generateLink/path-parameters.adoc[]

==== Request Parameters

include::{snippets}/auth/link/request-parameters.adoc[]
include::{snippets}/auth/generateLink/request-parameters.adoc[]

==== Response
==== HTTP Response

include::{snippets}/auth/link/http-response.adoc[]
include::{snippets}/auth/generateLink/http-response.adoc[]

==== ResponseFields
==== Response Fields

include::{snippets}/auth/link/response-fields.adoc[]
include::{snippets}/auth/generateLink/response-fields.adoc[]

=== OAuth 로그인

==== Request
==== HTTP Request

include::{snippets}/auth/token/http-request.adoc[]
include::{snippets}/auth/generateToken/http-request.adoc[]

==== PathParameters

include::{snippets}/auth/token/path-parameters.adoc[]

==== RequestFields

include::{snippets}/auth/token/request-fields.adoc[]

==== Response
==== Path Parameters

include::{snippets}/auth/token/http-response.adoc[]
include::{snippets}/auth/generateToken/path-parameters.adoc[]

=== OAuth 로그인 : Resource Server 에러
==== Request Fields

==== Request
include::{snippets}/auth/generateToken/request-fields.adoc[]

include::{snippets}/auth/exception/token/http-request.adoc[]
==== HTTP Response

==== PathParameters
include::{snippets}/auth/generateToken/http-response.adoc[]

include::{snippets}/auth/exception/token/path-parameters.adoc[]
==== Response Fields

==== RequestFields
include::{snippets}/auth/generateToken/response-fields.adoc[]

include::{snippets}/auth/exception/token/request-fields.adoc[]
=== OAuth 로그인 (Resource Server 에러)

==== Response
==== HTTP Response

include::{snippets}/auth/exception/token/http-response.adoc[]
include::{snippets}/auth/generateToken/failByResourceServerError/http-response.adoc[]
126 changes: 57 additions & 69 deletions backend/src/docs/asciidoc/category.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,144 +2,132 @@

=== 카테고리 생성

==== Request
==== HTTP Request

include::{snippets}/categories/save/http-request.adoc[]
include::{snippets}/category/save/http-request.adoc[]

==== Response
==== Request Fields

include::{snippets}/categories/save/http-response.adoc[]
include::{snippets}/category/save/request-fields.adoc[]

=== 카테고리 생성 (유효하지 않은 카테고리 이름)
==== HTTP Response

==== Request
include::{snippets}/category/save/http-response.adoc[]

include::{snippets}/categories/save/badRequest/http-request.adoc[]
==== Response Fields

include::{snippets}/category/save/response-fields.adoc[]

=== 카테고리 생성 (유효하지 않은 카테고리 이름)

==== Response
==== HTTP Response

include::{snippets}/categories/save/badRequest/http-response.adoc[]
include::{snippets}/category/save/failByInvalidNameFormat/http-response.adoc[]

=== 전체 카테고리 조회

==== Request

include::{snippets}/categories/findAll/http-request.adoc[]
include::{snippets}/category/findAllByName/allByNoName/http-request.adoc[]

==== RequestParameters
==== Request Parameters

include::{snippets}/categories/findAll/request-parameters.adoc[]
include::{snippets}/category/findAllByName/allByNoName/request-parameters.adoc[]

==== Response
==== HTTP Response

include::{snippets}/categories/findAll/http-response.adoc[]
include::{snippets}/category/findAllByName/allByNoName/http-response.adoc[]

=== 카테고리 제목 조회
=== 전체 카테고리 목록 이름으로 필터링

==== Request
==== HTTP Request

include::{snippets}/categories/findAllLikeName/http-request.adoc[]
include::{snippets}/category/findAllByName/fileterByName/http-request.adoc[]

==== RequestParameters
==== Request Parameters

include::{snippets}/categories/findAllLikeName/request-parameters.adoc[]
include::{snippets}/category/findAllByName/fileterByName/request-parameters.adoc[]

==== Response
==== HTTP Response

include::{snippets}/categories/findAllLikeName/http-response.adoc[]
include::{snippets}/category/findAllByName/fileterByName/http-response.adoc[]

=== 자신이 생성한 카테고리 조회

==== Request
==== HTTP Request

include::{snippets}/categories/findMine/http-request.adoc[]
include::{snippets}/category/findMineByName/allByNoName/http-request.adoc[]

==== RequestParameters
==== Request Parameters

include::{snippets}/categories/findMine/request-parameters.adoc[]
include::{snippets}/category/findMineByName/allByNoName/request-parameters.adoc[]

==== Response
==== HTTP Response

include::{snippets}/categories/findMine/response-body.adoc[]
include::{snippets}/category/findMineByName/allByNoName/http-response.adoc[]

=== ID를 통한 카테고리 단건 조회

==== Request
==== HTTP Request

include::{snippets}/categories/findById/http-request.adoc[]
include::{snippets}/category/findById/http-request.adoc[]

==== PathParameters
==== Path Parameters

include::{snippets}/categories/findById/path-parameters.adoc[]
include::{snippets}/category/findById/path-parameters.adoc[]

==== Response
==== HTTP Response

include::{snippets}/categories/findById/http-response.adoc[]
include::{snippets}/category/findById/http-response.adoc[]

=== ID를 통한 카테고리 단건 조회 (존재하지 않는 경우)

==== Request

include::{snippets}/categories/findById/notFound/http-request.adoc[]

==== Response
==== HTTP Response

include::{snippets}/categories/findById/notFound/http-response.adoc[]
include::{snippets}/category/findById/failByNoCategory/http-response.adoc[]

=== 카테고리 수정

==== Request
==== HTTP Request

include::{snippets}/categories/update/http-request.adoc[]
include::{snippets}/category/update/http-request.adoc[]

==== PathParameters
==== Path Parameters

include::{snippets}/categories/update/path-parameters.adoc[]
include::{snippets}/category/update/path-parameters.adoc[]

==== Response
==== HTTP Response

include::{snippets}/categories/update/http-response.adoc[]
include::{snippets}/category/update/http-response.adoc[]

=== 카테고리 수정 (존재하지 않는 경우)

==== Request

include::{snippets}/categories/update/notFound/http-request.adoc[]
==== HTTP Response

==== Response

include::{snippets}/categories/update/notFound/http-response.adoc[]
include::{snippets}/category/update/failByNoCategory/http-response.adoc[]

=== 카테고리 수정 (유효하지 않은 카테고리 이름)

==== Request

include::{snippets}/categories/update/badRequest/http-request.adoc[]
==== HTTP Response

==== Response

include::{snippets}/categories/update/badRequest/http-response.adoc[]
include::{snippets}/category/update/failByInvalidNameFormat/http-response.adoc[]

=== 카테고리 삭제

==== Request
==== HTTP Request

include::{snippets}/categories/delete/http-request.adoc[]
include::{snippets}/category/delete/http-request.adoc[]

==== PathParameters
==== Path Parameters

include::{snippets}/categories/delete/path-parameters.adoc[]
include::{snippets}/category/delete/path-parameters.adoc[]

==== Response
==== HTTP Response

include::{snippets}/categories/delete/http-response.adoc[]
include::{snippets}/category/delete/http-response.adoc[]

=== 카테고리 삭제 (존재하지 않는 경우)

==== Request

include::{snippets}/categories/delete/notFound/http-request.adoc[]

==== Response
==== HTTP Response

include::{snippets}/categories/delete/notFound/http-response.adoc[]
include::{snippets}/category/delete/failByNoCategory/http-response.adoc[]
42 changes: 13 additions & 29 deletions backend/src/docs/asciidoc/external-calendar.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,46 +2,30 @@

=== 자신의 외부 캘린더 조회

==== Request
==== HTTP Request

include::{snippets}/external-calendars/get/http-request.adoc[]
include::{snippets}/externalCalendar/getExternalCalendar/http-request.adoc[]

==== Response
==== HTTP Response

include::{snippets}/external-calendars/get/http-response.adoc[]
include::{snippets}/externalCalendar/getExternalCalendar/http-response.adoc[]

=== 자신의 외부 캘린더 저장

==== Request
==== HTTP Request

include::{snippets}/external-calendars/save/http-request.adoc[]
include::{snippets}/externalCalendar/save/http-request.adoc[]

==== Request Headers
==== Request Fields

include::{snippets}/external-calendars/save/request-headers.adoc[]
include::{snippets}/externalCalendar/save/request-fields.adoc[]

==== Request Body
==== HTTP Response

include::{snippets}/external-calendars/save/request-fields.adoc[]
include::{snippets}/externalCalendar/save/http-response.adoc[]

==== Response
=== 자신의 외부 캘린더 저장 (중복 저장할 경우)

include::{snippets}/external-calendars/save/http-response.adoc[]
==== HTTP Response

=== 자신의 외부 캘린더 중복 저장 시 예외 발생

==== Request

include::{snippets}/external-calendars/duplicated-save/http-request.adoc[]

==== Request Headers

include::{snippets}/external-calendars/duplicated-save/request-headers.adoc[]

==== Request Body

include::{snippets}/external-calendars/duplicated-save/request-fields.adoc[]

==== Response

include::{snippets}/external-calendars/duplicated-save/http-response.adoc[]
include::{snippets}/externalCalendar/save/failByDuplicate/http-response.adoc[]
Loading

0 comments on commit 0665ecc

Please sign in to comment.