Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

管理アプリ（バックエンド）を策定したAPI仕様に沿って修正 #1594

Merged
merged 18 commits into from
Dec 18, 2024
Merged

管理アプリ（バックエンド）を策定したAPI仕様に沿って修正 #1594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0f3893c
カタログアイテムのdtoの引数を修正
kenjiyoshid-a Nov 21, 2024
924f005
アプリケーションサービスの更新メソッドの引数を修正
kenjiyoshid-a Nov 21, 2024
1b987fd
カタログアイテムのgetのdtoのフィールドに行バージョンを追加
kenjiyoshid-a Nov 21, 2024
ff3de4b
API仕様の軽微な修正
kenjiyoshid-a Nov 21, 2024
4bf0256
javadocの誤記を修正
kenjiyoshid-a Nov 25, 2024
521ae69
Merge branch 'develop/admin/dressca-admin-main' into feature/管理アプリを策定…
kenjiyoshid-a Nov 26, 2024
2c779fe
楽観ロック対応のタスクの不要な記述を削除
kenjiyoshid-a Dec 16, 2024
9edcb1c
ユーザロールを複数返すように変更
kenjiyoshid-a Dec 16, 2024
712deb3
DTOクラス群の命名を変更
kenjiyoshid-a Dec 16, 2024
82c96b2
カタログアイテムを削除に楽観同時実行制御を実装
kenjiyoshid-a Dec 16, 2024
97af961
不足しているAPIレスポンスを追加
kenjiyoshid-a Dec 16, 2024
b6660e2
ユーザーロールを定数で管理
kenjiyoshid-a Dec 16, 2024
fac238e
PagedListOfCatalogItemResponseの変更分をマージ
kenjiyoshid-a Dec 16, 2024
1f3fbf7
Merge branch 'develop/admin/dressca-admin-main' into feature/管理アプリを策定…
kenjiyoshid-a Dec 16, 2024
541c646
adminのAPI仕様書を更新
kenjiyoshid-a Dec 16, 2024
cdd7b7a
adminのPagedListOfCatalogItemResponseをPagedListOfGetCatalogItemRespons…
kenjiyoshid-a Dec 16, 2024
273aee0
adminとconsumerのdependabot version updateの設定を追加
kenjiyoshid-a Dec 16, 2024
495fa25
指摘事項への対応
kenjiyoshid-a Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,30 @@ updates:
- "gradle"
- "dependencies"

- package-ecosystem: "gradle"
directory: "/samples/web-csr/dressca-backend/web-admin"
schedule:
interval: "daily"
open-pull-requests-limit: 20
commit-message:
prefix: "gradle-web-admin"
labels:
- "target: Dressca"
- "gradle"
- "dependencies"

- package-ecosystem: "gradle"
directory: "/samples/web-csr/dressca-backend/web-consumer"
schedule:
interval: "daily"
open-pull-requests-limit: 20
commit-message:
prefix: "gradle-web-consumer"
labels:
- "target: Dressca"
- "gradle"
- "dependencies"

# Azure AD B2C
- package-ecosystem: "npm"
directory: "/samples/azure-ad-b2c-sample/auth-frontend"
Expand Down
159 changes: 111 additions & 48 deletions samples/web-csr/dressca-backend/api-docs/web-admin/api-specification.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,16 @@
}
}
},
"description": "成功."
"description": "成功。"
},
"401": {
"description": "未認証。"
},
"404": {
"description": "アセットコードに対応するアセットがない."
"description": "アセットコードに対応するアセットがない。"
},
"500": {
"description": "サーバーエラー。"
}
},
"summary": "アセットを取得する.",
Expand All @@ -139,12 +145,18 @@
"schema": {
"type": "array",
"items": {
"$ref": "#/components/schemas/CatalogBrandResponse"
"$ref": "#/components/schemas/GetCatalogBrandsResponse"
}
}
}
},
"description": "成功"
"description": "成功。"
},
"401": {
"description": "未認証。"
},
"500": {
"description": "サーバーエラー。"
}
},
"summary": "カタログブランドの一覧を取得する.",
Expand All @@ -164,12 +176,18 @@
"schema": {
"type": "array",
"items": {
"$ref": "#/components/schemas/CatalogCategoryResponse"
"$ref": "#/components/schemas/GetCatalogCategoriesResponse"
}
}
}
},
"description": "成功"
"description": "成功。"
},
"401": {
"description": "未認証。"
},
"500": {
"description": "サーバーエラー。"
}
},
"summary": "カタログカテゴリの一覧を取得します.",
Expand Down Expand Up @@ -229,20 +247,23 @@
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/PagedListOfCatalogItemResponse"
"$ref": "#/components/schemas/PagedListOfGetCatalogItemResponse"
}
}
},
"description": "成功"
"description": "成功。"
},
"400": {
"description": "リクエストエラー"
"description": "リクエストエラー。"
},
"401": {
"description": "未認証エラー"
"description": "未認証。"
},
"404": {
"description": "リソースアクセスエラー"
"description": "失敗。"
},
"500": {
"description": "サーバーエラー。"
}
},
"summary": "カタログアイテムを検索して返します.",
Expand All @@ -267,11 +288,17 @@
"201": {
"description": "成功。"
},
"400": {
"description": "リクエストエラー。"
},
"401": {
"description": "未認証エラー"
"description": "未認証。"
},
"404": {
"description": "リソースアクセスエラー"
"description": "失敗。"
},
"500": {
"description": "サーバーエラー。"
}
},
"summary": "カタログにアイテムを追加します。",
Expand All @@ -293,17 +320,35 @@
"type": "integer",
"format": "int64"
}
},
{
"in": "query",
"name": "rowVersion",
"required": true,
"schema": {
"type": "string",
"format": "date-time"
}
}
],
"responses": {
"204": {
"description": "成功."
"description": "成功。"
},
"400": {
"description": "リクエストエラー。"
},
"401": {
"description": "未認証エラー"
"description": "未認証。"
},
"404": {
"description": "対象のIDが存在しない。"
"description": "指定した ID のアイテムがカタログに存在しない。"
},
"409": {
"description": "競合が発生。"
},
"500": {
"description": "サーバーエラー。"
}
},
"summary": "カタログから指定したカタログアイテム ID のアイテムを削除します。",
Expand Down Expand Up @@ -337,16 +382,22 @@
},
"responses": {
"204": {
"description": "成功."
"description": "成功。"
},
"400": {
"description": "リクエストエラー。"
},
"401": {
"description": "未認証エラー"
"description": "未認証。"
},
"404": {
"description": "対象のIDが存在しない。"
"description": "指定した ID のアイテムがカタログに存在しない。"
},
"409": {
"description": "更新の競合が発生。"
"description": "競合が発生。"
},
"500": {
"description": "サーバーエラー。"
}
},
"summary": "指定したIDのカタログアイテムの情報を更新します。",
Expand All @@ -358,7 +409,7 @@
"/api/catalog-items/{id}": {
"get": {
"description": "指定したIDのカタログアイテムを返します。",
"operationId": "getById",
"operationId": "getCatalogItem",
"parameters": [
{
"in": "path",
Expand All @@ -375,17 +426,23 @@
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/CatalogItemResponse"
"$ref": "#/components/schemas/GetCatalogItemResponse"
}
}
},
"description": "成功"
"description": "成功。"
},
"400": {
"description": "リクエストエラー。"
},
"401": {
"description": "未認証エラー"
"description": "未認証。"
},
"404": {
"description": "対象のIDが存在しない。"
"description": "指定した ID のアイテムがカタログに存在しない。"
},
"500": {
"description": "サーバーエラー。"
}
},
"summary": "指定したIDのカタログアイテムを返します。",
Expand Down Expand Up @@ -465,14 +522,17 @@
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/UserResponse"
"$ref": "#/components/schemas/GetLoginUserResponse"
}
}
},
"description": "成功."
"description": "成功。"
},
"401": {
"description": "未認証エラー."
"description": "未認証。"
},
"500": {
"description": "サーバーエラー。"
}
},
"summary": "ログイン中のユーザーの情報を取得します。",
Expand All @@ -484,7 +544,7 @@
},
"components": {
"schemas": {
"CatalogBrandResponse": {
"GetCatalogBrandsResponse": {
"type": "object",
"properties": {
"id": {
Expand All @@ -500,7 +560,7 @@
"name"
]
},
"CatalogCategoryResponse": {
"GetCatalogCategoriesResponse": {
"type": "object",
"properties": {
"id": {
Expand All @@ -516,7 +576,7 @@
"name"
]
},
"CatalogItemResponse": {
"GetCatalogItemResponse": {
"type": "object",
"properties": {
"assetCodes": {
Expand Down Expand Up @@ -565,6 +625,24 @@
"rowVersion"
]
},
"GetLoginUserResponse": {
"type": "object",
"properties": {
"roles": {
"type": "array",
"items": {
"type": "string"
}
},
"userName": {
"type": "string"
}
},
"required": [
"roles",
"userName"
]
},
"Link": {
"type": "object",
"properties": {
Expand All @@ -576,7 +654,7 @@
}
}
},
"PagedListOfCatalogItemResponse": {
"PagedListOfGetCatalogItemResponse": {
"type": "object",
"properties": {
"hasNext": {
Expand All @@ -588,7 +666,7 @@
"items": {
"type": "array",
"items": {
"$ref": "#/components/schemas/CatalogItemResponse"
"$ref": "#/components/schemas/GetCatalogItemResponse"
}
},
"page": {
Expand Down Expand Up @@ -681,21 +759,6 @@
"productCode",
"rowVersion"
]
},
"UserResponse": {
"type": "object",
"properties": {
"role": {
"type": "string"
},
"userName": {
"type": "string"
}
},
"required": [
"role",
"userName"
]
}
}
}
Expand Down
Loading