-
Notifications
You must be signed in to change notification settings - Fork 0
プラン設定機能追加 #7
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
Merged
Merged
プラン設定機能追加 #7
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 hidden or 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 | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -600,4 +600,134 @@ private function calcTieredUsage(int $count, array $unit): int | |||||||
| } | ||||||||
| return $total; | ||||||||
| } | ||||||||
|
|
||||||||
| /* ================================================================ | ||||||||
| * /pricing_plans ─ 料金プラン一覧取得 | ||||||||
| *=============================================================== */ | ||||||||
| public function getPricingPlans(Request $req) | ||||||||
| { | ||||||||
| try { | ||||||||
| $pricingPlansResponse = $this->pricing->getPricingPlans(); | ||||||||
| return response()->json($pricingPlansResponse->getPricingPlans()); | ||||||||
| } catch (\Throwable $e) { | ||||||||
| Log::error($e->getMessage()); | ||||||||
| return response()->json(['detail' => 'Internal server error'], Response::HTTP_INTERNAL_SERVER_ERROR); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| /* ================================================================ | ||||||||
| * /tax_rates ─ 税率一覧取得 | ||||||||
| *=============================================================== */ | ||||||||
| public function getTaxRates(Request $req) | ||||||||
| { | ||||||||
| try { | ||||||||
| $taxRatesResponse = $this->pricing->getTaxRates(); | ||||||||
| return response()->json($taxRatesResponse->getTaxRates()); | ||||||||
| } catch (\Throwable $e) { | ||||||||
| Log::error($e->getMessage()); | ||||||||
| return response()->json(['detail' => 'Internal server error'], Response::HTTP_INTERNAL_SERVER_ERROR); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| /* ================================================================ | ||||||||
| * GET /tenants/{tenant_id}/plan ─ テナントプラン情報取得 | ||||||||
| *=============================================================== */ | ||||||||
| public function getTenantPlanInfo(Request $req, string $tenantId) | ||||||||
| { | ||||||||
| try { | ||||||||
| if (!$tenantId) { | ||||||||
| return response()->json(['error' => 'tenant_id is required'], Response::HTTP_BAD_REQUEST); | ||||||||
| } | ||||||||
|
|
||||||||
| $userInfo = $req->userinfo ?? []; | ||||||||
| if (!$this->hasBillingAccess($userInfo, $tenantId)) { | ||||||||
| return response()->json(['error' => 'Insufficient permissions'], Response::HTTP_FORBIDDEN); | ||||||||
| } | ||||||||
|
|
||||||||
| $tenant = $this->auth->getTenant($tenantId); | ||||||||
| if (!$tenant) { | ||||||||
| return response()->json(['error' => 'Tenant not found'], Response::HTTP_NOT_FOUND); | ||||||||
| } | ||||||||
|
|
||||||||
| // 現在のプランの税率情報を取得(プラン履歴の最新エントリから) | ||||||||
| $currentTaxRateId = null; | ||||||||
| $planHistories = $tenant->getPlanHistories(); | ||||||||
| if (!empty($planHistories)) { | ||||||||
| $latestPlanHistory = end($planHistories); | ||||||||
| if ($latestPlanHistory->getTaxRateId()) { | ||||||||
| $currentTaxRateId = $latestPlanHistory->getTaxRateId(); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| $response = [ | ||||||||
| 'id' => $tenant->getId(), | ||||||||
| 'name' => $tenant->getName(), | ||||||||
| 'plan_id' => $tenant->getPlanId(), | ||||||||
| 'tax_rate_id' => $currentTaxRateId, | ||||||||
| 'plan_reservation' => null, | ||||||||
| ]; | ||||||||
|
|
||||||||
| // 予約情報がある場合は追加 | ||||||||
| if ($tenant->getUsingNextPlanFrom()) { | ||||||||
| $planReservation = [ | ||||||||
| 'next_plan_id' => $tenant->getNextPlanId(), | ||||||||
| 'using_next_plan_from' => $tenant->getUsingNextPlanFrom(), | ||||||||
| 'next_plan_tax_rate_id' => $tenant->getNextPlanTaxRateId(), | ||||||||
| ]; | ||||||||
| $response['plan_reservation'] = $planReservation; | ||||||||
| } | ||||||||
|
|
||||||||
| return response()->json($response); | ||||||||
| } catch (\Throwable $e) { | ||||||||
| Log::error($e->getMessage()); | ||||||||
| return response()->json(['error' => 'Failed to retrieve tenant detail'], Response::HTTP_INTERNAL_SERVER_ERROR); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| /* ================================================================ | ||||||||
| * PUT /tenants/{tenant_id}/plan ─ テナントプラン更新 | ||||||||
| *=============================================================== */ | ||||||||
| public function updateTenantPlan(Request $req, string $tenantId) | ||||||||
| { | ||||||||
| try { | ||||||||
| if (!$tenantId) { | ||||||||
| return response()->json(['error' => 'tenant_id is required'], Response::HTTP_BAD_REQUEST); | ||||||||
| } | ||||||||
|
Comment on lines
+693
to
+695
|
||||||||
| if (!$tenantId) { | |
| return response()->json(['error' => 'tenant_id is required'], Response::HTTP_BAD_REQUEST); | |
| } |
This file contains hidden or 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
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.
This validation is redundant. The $tenantId parameter comes from the route and will always have a value when this method is called. Laravel ensures route parameters are present, so this check will never trigger.