-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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を実装 #24
Open
CityBear3
wants to merge
2
commits into
develop
Choose a base branch
from
feature/11_create_purchase_request_api
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
購入申請作成APIを実装 #24
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
...s/membership/console/paymaster/infrastructure/api/request/UpsertPurchaseRequestRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
package cc.rits.membership.console.paymaster.infrastructure.api.request | ||
|
||
import cc.rits.membership.console.paymaster.exception.BadRequestException | ||
import cc.rits.membership.console.paymaster.exception.ErrorCode | ||
import cc.rits.membership.console.paymaster.util.ValidationUtil | ||
import io.micronaut.core.annotation.Introspected | ||
|
||
/** | ||
* 購入申請作成リクエスト | ||
*/ | ||
@Introspected | ||
class UpsertPurchaseRequestRequest( | ||
/** | ||
* 申請品名 | ||
*/ | ||
val name: String, | ||
|
||
/** | ||
* 説明 | ||
*/ | ||
val description: String, | ||
|
||
/** | ||
* 単価 | ||
*/ | ||
val price: Int, | ||
|
||
/** | ||
* 個数 | ||
*/ | ||
val quantity: Int, | ||
|
||
/** | ||
* URL | ||
*/ | ||
val url: String | ||
|
||
) : BaseRequest() { | ||
override fun validate() { | ||
if (!ValidationUtil.checkStringLength(name, 1, 255)) { | ||
throw BadRequestException(ErrorCode.INVALID_PURCHASE_REQUEST_NAME_LENGTH) | ||
} | ||
|
||
if (!ValidationUtil.checkStringLength(description, 1, 1023)) { | ||
throw BadRequestException(ErrorCode.INVALID_PURCHASE_REQUEST_DESCRIPTION_LENGTH) | ||
} | ||
|
||
if (!ValidationUtil.checkNumberLength(price, 1, Int.MAX_VALUE)) { | ||
throw BadRequestException(ErrorCode.INVALID_PURCHASE_REQUEST_PRICE) | ||
} | ||
|
||
if (!ValidationUtil.checkNumberLength(quantity, 1, Int.MAX_VALUE)) { | ||
throw BadRequestException(ErrorCode.INVALID_PURCHASE_REQUEST_QUANTITY) | ||
} | ||
|
||
if (!ValidationUtil.checkStringLength(url, 1, 1023)) { | ||
throw BadRequestException(ErrorCode.INVALID_PURCHASE_REQUEST_URL_LENGTH) | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
...its/membership/console/paymaster/usecase/purchase_request/CreatePurchaseRequestUseCase.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
package cc.rits.membership.console.paymaster.usecase.purchase_request | ||
|
||
import cc.rits.membership.console.paymaster.client.response.UserInfoResponse | ||
import cc.rits.membership.console.paymaster.domain.model.PurchaseRequestModel | ||
import cc.rits.membership.console.paymaster.domain.model.UserModel | ||
import cc.rits.membership.console.paymaster.domain.repository.PurchaseRequestRepository | ||
import cc.rits.membership.console.paymaster.enums.PurchaseRequestStatus | ||
import cc.rits.membership.console.paymaster.enums.UserRole | ||
import cc.rits.membership.console.paymaster.infrastructure.api.request.UpsertPurchaseRequestRequest | ||
import io.micronaut.security.authentication.Authentication | ||
import jakarta.inject.Singleton | ||
import javax.transaction.Transactional | ||
|
||
/** | ||
* 購入申請作成ユースケース | ||
*/ | ||
@Singleton | ||
@Transactional | ||
@Suppress("UNCHECKED_CAST") | ||
open class CreatePurchaseRequestUseCase( | ||
private val purchaseRequestRepository: PurchaseRequestRepository | ||
) { | ||
/** | ||
* 購入申請を作成 | ||
* | ||
* @param authentication 認証情報 | ||
* @param requestBody 購入申請作成リクエスト | ||
*/ | ||
open fun handle(authentication: Authentication, requestBody: UpsertPurchaseRequestRequest) { | ||
val userInfo = authentication.attributes["userInfo"] as UserInfoResponse | ||
val userModel = UserModel( | ||
id = userInfo.id, | ||
firstName = userInfo.firstName, | ||
lastName = userInfo.lastName, | ||
entranceYear = userInfo.entranceYear, | ||
roles = userInfo.userGroups.flatMap { userGroup -> | ||
userGroup.roles.mapNotNull { | ||
UserRole.findById(it) | ||
} | ||
} | ||
) | ||
|
||
val purchaseRequestModel = PurchaseRequestModel( | ||
name = requestBody.name, | ||
description = requestBody.description, | ||
price = requestBody.price, | ||
quantity = requestBody.quantity, | ||
url = requestBody.url, | ||
status = PurchaseRequestStatus.PENDING_APPROVAL, | ||
requestedBy = userModel | ||
) | ||
|
||
purchaseRequestRepository.insert(purchaseRequestModel) | ||
} | ||
} |
40 changes: 40 additions & 0 deletions
40
src/main/kotlin/cc/rits/membership/console/paymaster/util/ValidationUtil.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
package cc.rits.membership.console.paymaster.util | ||
|
||
import io.micronaut.core.util.StringUtils | ||
|
||
/** | ||
* バリデーションユーティリティ | ||
*/ | ||
class ValidationUtil { | ||
companion object { | ||
/** | ||
* 文字列の長さが範囲に収まるかチェック | ||
* | ||
* @param string 文字列 | ||
* @param min 最小値 | ||
* @param max 最大値 | ||
* | ||
* @return バリデーション結果 | ||
*/ | ||
fun checkStringLength(string: String, min: Int, max: Int): Boolean { | ||
if (StringUtils.isEmpty(string) && min != 0) { | ||
return false | ||
} | ||
|
||
return string.length in min..max | ||
} | ||
|
||
/** | ||
* 数値が範囲に収まるかチェック | ||
* | ||
* @param value 数値 | ||
* @param min 最小値 | ||
* @param max 最大値 | ||
* | ||
* @return バリデーション結果 | ||
*/ | ||
fun checkNumberLength(value: Int, min: Int, max: Int): Boolean { | ||
return value in min..max | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[must] メール送信処理が抜けています。