feat(api): mobile API Milestone 3 — full PULL (delta, tombstones, templates)
ProjectApiController bundle now supports incremental sync: - ?since=<ISO8601> returns only records changed after that time (phases, layers, features, inspections, issues, templates), each filtered by its own updated_at. - 'deleted' tombstones (soft-deleted ids since 'since') for phases/layers/ features/inspections/issues so the device can purge locally. - Bundle now also includes inspections, issues and inspection templates (with version + content hash for incremental template download). - New GET /api/v1/templates (accessible projects, ?since= delta). Tests: 12 passing (added delta, tombstones, templates cases). Note: the 'since' query param must be URL-encoded by clients (ISO8601 '+' offset). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -3,7 +3,14 @@
|
||||
namespace App\Http\Controllers\Api\V1;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Feature;
|
||||
use App\Models\Inspection;
|
||||
use App\Models\InspectionTemplate;
|
||||
use App\Models\Issue;
|
||||
use App\Models\Layer;
|
||||
use App\Models\Phase;
|
||||
use App\Models\Project;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class ProjectApiController extends Controller
|
||||
@@ -19,61 +26,144 @@ class ProjectApiController extends Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* Offline bundle for one project (Milestone 2 — minimal: structure, no media yet).
|
||||
* Offline bundle for one project. Full snapshot, or a delta when `?since=` is
|
||||
* given (only records changed after that timestamp + tombstones for deletions).
|
||||
*/
|
||||
public function bundle(Request $request, Project $project)
|
||||
{
|
||||
$this->authorizeProject($request, $project);
|
||||
|
||||
$since = $request->query('since');
|
||||
$since = $since ? Carbon::parse($since) : null;
|
||||
|
||||
$changed = fn ($query) => $since ? $query->where('updated_at', '>', $since) : $query;
|
||||
|
||||
$allPhaseIds = Phase::withTrashed()->where('project_id', $project->id)->pluck('id');
|
||||
$allLayerIds = Layer::withTrashed()->whereIn('phase_id', $allPhaseIds)->pluck('id');
|
||||
|
||||
$phases = $changed(Phase::where('project_id', $project->id))->orderBy('order')->get();
|
||||
$layers = $changed(Layer::whereIn('phase_id', $allPhaseIds))->get();
|
||||
$features = $changed(Feature::whereIn('layer_id', $allLayerIds))->get();
|
||||
$inspections = $changed(Inspection::where('project_id', $project->id))->get();
|
||||
$issues = $changed(Issue::where('project_id', $project->id))->get();
|
||||
$templates = $changed(InspectionTemplate::where('project_id', $project->id))->get();
|
||||
|
||||
return response()->json([
|
||||
'server_time' => now()->toIso8601String(),
|
||||
'project' => $this->mapProject($project),
|
||||
'phases' => $phases->map(fn ($p) => $this->mapPhase($p))->values(),
|
||||
'layers' => $layers->map(fn ($l) => $this->mapLayer($l))->values(),
|
||||
'features' => $features->map(fn ($f) => $this->mapFeature($f))->values(),
|
||||
'inspections' => $inspections->map(fn ($i) => $this->mapInspection($i))->values(),
|
||||
'issues' => $issues->map(fn ($i) => $this->mapIssue($i))->values(),
|
||||
'templates' => $templates->map(fn ($t) => $this->mapTemplate($t))->values(),
|
||||
'deleted' => $since ? $this->tombstones($since, $project, $allPhaseIds, $allLayerIds) : (object) [],
|
||||
]);
|
||||
}
|
||||
|
||||
/** Inspection templates for the projects the user can access (with version/hash). */
|
||||
public function templates(Request $request)
|
||||
{
|
||||
$since = $request->query('since');
|
||||
$since = $since ? Carbon::parse($since) : null;
|
||||
|
||||
$projectIds = Project::accessibleBy($request->user())->pluck('id');
|
||||
|
||||
$query = InspectionTemplate::whereIn('project_id', $projectIds);
|
||||
if ($since) {
|
||||
$query->where('updated_at', '>', $since);
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
'templates' => $query->get()->map(fn ($t) => $this->mapTemplate($t))->values(),
|
||||
]);
|
||||
}
|
||||
|
||||
// ── Helpers ────────────────────────────────────────────────────────────────
|
||||
|
||||
private function authorizeProject(Request $request, Project $project): void
|
||||
{
|
||||
$user = $request->user();
|
||||
abort_unless(
|
||||
$user->can('manage all') || $project->users()->where('user_id', $user->id)->exists(),
|
||||
403
|
||||
);
|
||||
}
|
||||
|
||||
$project->load([
|
||||
'phases' => fn ($q) => $q->orderBy('order'),
|
||||
'phases.layers',
|
||||
'phases.layers.features',
|
||||
]);
|
||||
private function tombstones(Carbon $since, Project $project, $allPhaseIds, $allLayerIds): array
|
||||
{
|
||||
return [
|
||||
'phases' => Phase::onlyTrashed()->where('project_id', $project->id)->where('deleted_at', '>', $since)->pluck('id')->values(),
|
||||
'layers' => Layer::onlyTrashed()->whereIn('phase_id', $allPhaseIds)->where('deleted_at', '>', $since)->pluck('id')->values(),
|
||||
'features' => Feature::onlyTrashed()->whereIn('layer_id', $allLayerIds)->where('deleted_at', '>', $since)->pluck('id')->values(),
|
||||
'inspections' => Inspection::onlyTrashed()->where('project_id', $project->id)->where('deleted_at', '>', $since)->pluck('id')->values(),
|
||||
'issues' => Issue::onlyTrashed()->where('project_id', $project->id)->where('deleted_at', '>', $since)->pluck('id')->values(),
|
||||
];
|
||||
}
|
||||
|
||||
$layers = $project->phases->flatMap->layers;
|
||||
$features = $layers->flatMap->features;
|
||||
private function mapProject(Project $p): array
|
||||
{
|
||||
return [
|
||||
'id' => $p->id, 'reference' => $p->reference, 'name' => $p->name,
|
||||
'address' => $p->address, 'lat' => $p->lat, 'lng' => $p->lng,
|
||||
'status' => $p->status, 'updated_at' => $p->updated_at?->toIso8601String(),
|
||||
];
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
'server_time' => now()->toIso8601String(),
|
||||
'project' => [
|
||||
'id' => $project->id,
|
||||
'reference' => $project->reference,
|
||||
'name' => $project->name,
|
||||
'address' => $project->address,
|
||||
'lat' => $project->lat,
|
||||
'lng' => $project->lng,
|
||||
'status' => $project->status,
|
||||
'updated_at' => $project->updated_at?->toIso8601String(),
|
||||
],
|
||||
'phases' => $project->phases->map(fn ($p) => [
|
||||
'id' => $p->id,
|
||||
'name' => $p->name,
|
||||
'order' => $p->order,
|
||||
'color' => $p->color,
|
||||
'progress_percent' => $p->progress_percent,
|
||||
'updated_at' => $p->updated_at?->toIso8601String(),
|
||||
])->values(),
|
||||
'layers' => $layers->map(fn ($l) => [
|
||||
'id' => $l->id,
|
||||
'phase_id' => $l->phase_id,
|
||||
'name' => $l->name,
|
||||
'color' => $l->color,
|
||||
'updated_at' => $l->updated_at?->toIso8601String(),
|
||||
])->values(),
|
||||
'features' => $features->map(fn ($f) => [
|
||||
'id' => $f->id,
|
||||
'layer_id' => $f->layer_id,
|
||||
'name' => $f->name,
|
||||
'geometry' => $f->geometry,
|
||||
'status' => $f->status,
|
||||
'progress' => $f->progress,
|
||||
'updated_at' => $f->updated_at?->toIso8601String(),
|
||||
])->values(),
|
||||
]);
|
||||
private function mapPhase(Phase $p): array
|
||||
{
|
||||
return [
|
||||
'id' => $p->id, 'name' => $p->name, 'order' => $p->order, 'color' => $p->color,
|
||||
'progress_percent' => $p->progress_percent, 'updated_at' => $p->updated_at?->toIso8601String(),
|
||||
];
|
||||
}
|
||||
|
||||
private function mapLayer(Layer $l): array
|
||||
{
|
||||
return [
|
||||
'id' => $l->id, 'phase_id' => $l->phase_id, 'name' => $l->name,
|
||||
'color' => $l->color, 'updated_at' => $l->updated_at?->toIso8601String(),
|
||||
];
|
||||
}
|
||||
|
||||
private function mapFeature(Feature $f): array
|
||||
{
|
||||
return [
|
||||
'id' => $f->id, 'layer_id' => $f->layer_id, 'name' => $f->name,
|
||||
'geometry' => $f->geometry, 'status' => $f->status, 'progress' => $f->progress,
|
||||
'responsible' => $f->responsible, 'template_id' => $f->template_id,
|
||||
'updated_at' => $f->updated_at?->toIso8601String(),
|
||||
];
|
||||
}
|
||||
|
||||
private function mapInspection(Inspection $i): array
|
||||
{
|
||||
return [
|
||||
'id' => $i->id, 'feature_id' => $i->feature_id, 'layer_id' => $i->layer_id,
|
||||
'template_id' => $i->template_id, 'user_id' => $i->user_id, 'data' => $i->data,
|
||||
'status' => $i->status, 'result' => $i->result, 'notes' => $i->notes,
|
||||
'created_at' => $i->created_at?->toIso8601String(), 'updated_at' => $i->updated_at?->toIso8601String(),
|
||||
];
|
||||
}
|
||||
|
||||
private function mapIssue(Issue $i): array
|
||||
{
|
||||
return [
|
||||
'id' => $i->id, 'feature_id' => $i->feature_id, 'title' => $i->title,
|
||||
'description' => $i->description, 'status' => $i->status, 'priority' => $i->priority,
|
||||
'reported_by' => $i->reported_by, 'assigned_to' => $i->assigned_to,
|
||||
'resolved_at' => $i->resolved_at?->toIso8601String(), 'updated_at' => $i->updated_at?->toIso8601String(),
|
||||
];
|
||||
}
|
||||
|
||||
private function mapTemplate(InspectionTemplate $t): array
|
||||
{
|
||||
return [
|
||||
'id' => $t->id, 'project_id' => $t->project_id, 'phase_id' => $t->phase_id,
|
||||
'name' => $t->name, 'description' => $t->description, 'fields' => $t->fields,
|
||||
'version' => $t->updated_at?->timestamp,
|
||||
'hash' => md5(json_encode($t->fields) . $t->name),
|
||||
'updated_at' => $t->updated_at?->toIso8601String(),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user