Implement household, QR sale, team helpers assignment, and helper endpoints

This commit is contained in:
Developer
2026-06-29 16:56:33 +08:00
parent b85fc255cf
commit 7dc074e3c3
31 changed files with 1574 additions and 98 deletions

View File

@@ -6,10 +6,14 @@ use App\Http\Controllers\Api\V1\ApiController;
use App\Http\Requests\Admin\RejectProfileRequest;
use App\Http\Requests\Admin\UpdateUserRequest;
use App\Http\Resources\UserDetailResource;
use App\Http\Resources\HouseholdResource;
use App\Models\User;
use App\Models\Household;
use App\Models\HouseholdMember;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\DB;
class AdminUserController extends ApiController
{
@@ -110,6 +114,19 @@ class AdminUserController extends ApiController
public function activate(User $user): JsonResponse
{
if ($user->role === User::ROLE_RESIDENT) {
if (! auth()->user()->isSuperAdmin()) {
return $this->forbidden('Only Super Admins can activate or approve resident profiles');
}
$householdMember = \App\Models\HouseholdMember::where('user_id', $user->id)->first();
$household = $householdMember ? $householdMember->household : $user->headedHousehold;
if (! $household || ! $household->coordinates) {
return $this->fail('Resident household must have coordinates pinned before activation', null, 422);
}
}
$user->forceFill(['status' => User::STATUS_ACTIVE])->save();
return $this->ok(new UserDetailResource($user->fresh()), 'User activated');
@@ -134,6 +151,19 @@ class AdminUserController extends ApiController
return $this->fail('User has no verifiable profile', null, 422);
}
if ($user->role === User::ROLE_RESIDENT) {
if (! auth()->user()->isSuperAdmin()) {
return $this->forbidden('Only Super Admins can activate or approve resident profiles');
}
$householdMember = \App\Models\HouseholdMember::where('user_id', $user->id)->first();
$household = $householdMember ? $householdMember->household : $user->headedHousehold;
if (! $household || ! $household->coordinates) {
return $this->fail('Resident household must have coordinates pinned before activation', null, 422);
}
}
$profile->markVerified($request->user());
$user->forceFill(['status' => User::STATUS_ACTIVE])->save();
@@ -152,4 +182,113 @@ class AdminUserController extends ApiController
return $this->ok(new UserDetailResource($user->fresh()->load($user->profileRelation())), 'Profile rejected');
}
public function groupIntoHousehold(Request $request, User $user): JsonResponse
{
if ($user->role !== User::ROLE_RESIDENT) {
return $this->fail('Only Resident users can be grouped into households', null, 422);
}
$data = $request->validate([
'household_id' => ['nullable', 'integer', 'exists:households,id'],
// If household_id is null, require new household details:
'address_line' => ['required_without:household_id', 'nullable', 'string', 'max:255'],
'barangay_id' => ['required_without:household_id', 'nullable', 'integer', 'exists:barangays,id'],
'lat' => ['required_without:household_id', 'nullable', 'numeric', 'between:-90,90'],
'lng' => ['required_without:household_id', 'nullable', 'numeric', 'between:-180,180'],
'household_size' => ['nullable', 'integer', 'min:1', 'max:50'],
]);
if (! empty($data['household_id'])) {
$isMemberOfCurrent = HouseholdMember::where('user_id', $user->id)
->where('household_id', $data['household_id'])
->exists();
if ($isMemberOfCurrent) {
return $this->fail('Resident already belongs to this household.', null, 422);
}
}
$household = DB::transaction(function () use ($data, $user) {
// Find all existing memberships of this user
$existingMemberships = HouseholdMember::where('user_id', $user->id)->get();
foreach ($existingMemberships as $oldMember) {
$oldHousehold = $oldMember->household;
if ($oldHousehold) {
// Delete the old membership
$oldMember->delete();
// If they were the head of that old household
if ($oldHousehold->head_user_id == $user->id) {
$otherMembers = $oldHousehold->members()->where('user_id', '!=', $user->id)->get();
if ($otherMembers->isEmpty()) {
// Delete empty household
$oldHousehold->delete();
} else {
// Reassign head to next available member
$nextHead = $otherMembers->first();
$oldHousehold->update([
'head_user_id' => $nextHead->user_id,
]);
$nextHead->update([
'relationship' => HouseholdMember::RELATIONSHIP_HEAD,
]);
}
} else {
if ($oldHousehold->members()->count() === 0) {
$oldHousehold->delete();
}
}
}
}
if (! empty($data['household_id'])) {
$h = Household::findOrFail($data['household_id']);
HouseholdMember::create([
'household_id' => $h->id,
'user_id' => $user->id,
'relationship' => HouseholdMember::RELATIONSHIP_OTHER,
'full_name' => $user->full_name,
]);
$currentMemberCount = $h->members()->count();
if ($h->household_size < $currentMemberCount) {
$h->update(['household_size' => $currentMemberCount]);
}
return $h;
} else {
$point = new \MatanYadaev\EloquentSpatial\Objects\Point((float) $data['lat'], (float) $data['lng'], 4326);
$dopFinder = app(\App\Services\DropOff\DropOffPointFinder::class);
$nearestDop = $dopFinder->nearest((float) $data['lat'], (float) $data['lng']);
$h = Household::create([
'tenant_id' => $user->tenant_id,
'head_user_id' => $user->id,
'barangay_id' => $data['barangay_id'],
'address_line' => $data['address_line'],
'coordinates' => $point,
'household_size' => $data['household_size'] ?? 1,
'assigned_drop_off_point_id' => $nearestDop?->id,
'verification_status' => Household::VERIFICATION_PENDING,
]);
HouseholdMember::create([
'household_id' => $h->id,
'user_id' => $user->id,
'relationship' => HouseholdMember::RELATIONSHIP_HEAD,
'full_name' => $user->full_name,
]);
return $h;
}
});
$user->load(['residentProfile', 'driverProfile', 'helperProfile', 'scannerProfile', 'storePartnerProfile']);
return $this->ok([
'user' => new UserDetailResource($user),
'household' => new HouseholdResource($household->load(['head', 'barangay'])),
], 'User successfully grouped into household');
}
}