refactor(f4): remove inspection title from report contracts
This commit is contained in:
@@ -56,7 +56,7 @@ export interface InspectionReportListItem {
|
|||||||
urgency: string;
|
urgency: string;
|
||||||
deadlineAt: Date | null;
|
deadlineAt: Date | null;
|
||||||
};
|
};
|
||||||
visit: { id: string; code: string; title: string; status: string };
|
visit: { id: string; code: string; status: string };
|
||||||
companies: ContextAsset[];
|
companies: ContextAsset[];
|
||||||
areas: ContextAsset[];
|
areas: ContextAsset[];
|
||||||
findingCount: number;
|
findingCount: number;
|
||||||
@@ -76,7 +76,6 @@ export interface PendingInspectionReportItem {
|
|||||||
sealedAt: Date;
|
sealedAt: Date;
|
||||||
closureSha256: string;
|
closureSha256: string;
|
||||||
visitCode: string;
|
visitCode: string;
|
||||||
visitTitle: string;
|
|
||||||
companies: ContextAsset[];
|
companies: ContextAsset[];
|
||||||
areas: ContextAsset[];
|
areas: ContextAsset[];
|
||||||
findingCount: number;
|
findingCount: number;
|
||||||
@@ -152,7 +151,6 @@ export class InspectionReportsService {
|
|||||||
act.code ILIKE ${search}
|
act.code ILIKE ${search}
|
||||||
OR act.title ILIKE ${search}
|
OR act.title ILIKE ${search}
|
||||||
OR visit.code ILIKE ${search}
|
OR visit.code ILIKE ${search}
|
||||||
OR visit.title ILIKE ${search}
|
|
||||||
)`);
|
)`);
|
||||||
}
|
}
|
||||||
if (query.year) conditions.push(`act.act_year = ${add(query.year)}`);
|
if (query.year) conditions.push(`act.act_year = ${add(query.year)}`);
|
||||||
@@ -194,7 +192,6 @@ export class InspectionReportsService {
|
|||||||
act.sealed_at AS "sealedAt",
|
act.sealed_at AS "sealedAt",
|
||||||
act.closure_sha256 AS "closureSha256",
|
act.closure_sha256 AS "closureSha256",
|
||||||
visit.code AS "visitCode",
|
visit.code AS "visitCode",
|
||||||
visit.title AS "visitTitle",
|
|
||||||
COALESCE(context.companies, '[]'::jsonb) AS companies,
|
COALESCE(context.companies, '[]'::jsonb) AS companies,
|
||||||
COALESCE(context.areas, '[]'::jsonb) AS areas,
|
COALESCE(context.areas, '[]'::jsonb) AS areas,
|
||||||
COALESCE(finding_count.total, 0)::integer AS "findingCount"
|
COALESCE(finding_count.total, 0)::integer AS "findingCount"
|
||||||
@@ -259,8 +256,7 @@ export class InspectionReportsService {
|
|||||||
act.current_version AS "currentVersion",
|
act.current_version AS "currentVersion",
|
||||||
act.closure_sha256 AS "closureSha256",
|
act.closure_sha256 AS "closureSha256",
|
||||||
act.occurred_at AS "occurredAt",
|
act.occurred_at AS "occurredAt",
|
||||||
visit.code AS "visitCode",
|
visit.code AS "visitCode"
|
||||||
visit.title AS "visitTitle"
|
|
||||||
FROM inspection_acts act
|
FROM inspection_acts act
|
||||||
INNER JOIN inspection_visits visit ON visit.id = act.visit_id
|
INNER JOIN inspection_visits visit ON visit.id = act.visit_id
|
||||||
WHERE act.id = $1
|
WHERE act.id = $1
|
||||||
@@ -277,7 +273,6 @@ export class InspectionReportsService {
|
|||||||
closureSha256: string | null;
|
closureSha256: string | null;
|
||||||
occurredAt: Date;
|
occurredAt: Date;
|
||||||
visitCode: string;
|
visitCode: string;
|
||||||
visitTitle: string;
|
|
||||||
}>;
|
}>;
|
||||||
if (!act) throw actNotFound();
|
if (!act) throw actNotFound();
|
||||||
if (act.status !== InspectionActStatus.SEALED || !act.closureSha256) {
|
if (act.status !== InspectionActStatus.SEALED || !act.closureSha256) {
|
||||||
@@ -390,7 +385,6 @@ export class InspectionReportsService {
|
|||||||
OR act.code ILIKE ${search}
|
OR act.code ILIKE ${search}
|
||||||
OR act.title ILIKE ${search}
|
OR act.title ILIKE ${search}
|
||||||
OR visit.code ILIKE ${search}
|
OR visit.code ILIKE ${search}
|
||||||
OR visit.title ILIKE ${search}
|
|
||||||
)`);
|
)`);
|
||||||
}
|
}
|
||||||
if (query.year) conditions.push(`report.report_year = ${add(query.year)}`);
|
if (query.year) conditions.push(`report.report_year = ${add(query.year)}`);
|
||||||
@@ -475,7 +469,7 @@ export class InspectionReportsService {
|
|||||||
'urgency',act.urgency,'deadlineAt',act.deadline_at
|
'urgency',act.urgency,'deadlineAt',act.deadline_at
|
||||||
) AS act,
|
) AS act,
|
||||||
JSONB_BUILD_OBJECT(
|
JSONB_BUILD_OBJECT(
|
||||||
'id',visit.id,'code',visit.code,'title',visit.title,'status',visit.status
|
'id',visit.id,'code',visit.code,'status',visit.status
|
||||||
) AS visit,
|
) AS visit,
|
||||||
COALESCE(context.companies,'[]'::jsonb) AS companies,
|
COALESCE(context.companies,'[]'::jsonb) AS companies,
|
||||||
COALESCE(context.areas,'[]'::jsonb) AS areas,
|
COALESCE(context.areas,'[]'::jsonb) AS areas,
|
||||||
|
|||||||
Reference in New Issue
Block a user