avvir 6.0.3 → 7.0.0

package/source/api/trade_api.ts

@@ -0,0 +1,45 @@
+import ApiCapturedTradeCost from "../models/api/trade/api_captured_trade_cost";
+import ApiPlannedTradeCost from "../models/api/trade/api_planned_trade_cost";
+import ApiTrade from "../models/api/trade/api_trade";
+import ApiTradeCost from "../models/api/trade/api_trade_cost";
+import Http from "../utilities/http";
+import makeErrorsPretty from "../utilities/make_errors_pretty";
+import { AssociationIds, User } from "../models";
+import { DateConverter } from "../converters";
+
+export default class TradeApi {
+  static listTrades({ projectId }: AssociationIds, user: User) {
+    const url = `${Http.baseUrl()}/projects/${projectId}/trade-breakdown`;
+    return Http.get(url, user) as unknown as Promise<ApiTrade[]>;
+  }
+
+  static listPlannedTradeCosts({ projectId }: AssociationIds, user: User) {
+    const url = `${Http.baseUrl()}/projects/${projectId}/trade-breakdown/planned-costs`;
+    return Http.get(url, user) as unknown as Promise<ApiPlannedTradeCost[]>;
+  }
+
+  static listCapturedTradeCosts({ projectId }: AssociationIds, scanDate: Date, user: User) {
+    let url: string;
+    if (scanDate == null) {
+      url = `${Http.baseUrl()}/projects/${projectId}/trade-breakdown/captured-costs`;
+    } else {
+      url = `${Http.baseUrl()}/projects/${projectId}/trade-breakdown/captured-costs?capture-date=${DateConverter.dateToLocalDate(scanDate)}`;
+    }
+    return Http.get(url, user) as unknown as Promise<ApiCapturedTradeCost[]>;
+  }
+
+  static listTradeCosts({ projectId }: AssociationIds, user: User) {
+    const url = `${Http.baseUrl()}/projects/${projectId}/trade-breakdown/costs`;
+    return Http.get(url, user) as unknown as Promise<ApiTradeCost[]>;
+  }
+
+  static updateTradeCostReportedQuantity({ projectId }: AssociationIds,
+                                         tradeCode: string,
+                                         reportedQuantity: number,
+                                         user: User) {
+    const url = `${Http.baseUrl()}/projects/${projectId}/trade-breakdown/${tradeCode}/reported-quantity`;
+    return Http.put(url, user, reportedQuantity) as unknown as Promise<ApiTradeCost>;
+  }
+}
+
+makeErrorsPretty(TradeApi);

package/source/api/work_package_api.ts

@@ -0,0 +1,28 @@
+import ApiWorkPackage from "../models/api/api_work_package";
+import Http from "../utilities/http";
+import { AssociationIds, User } from "../models";
+import makeErrorsPretty from "../utilities/make_errors_pretty";
+
+export default class WorkPackageApi {
+  static listWorkPackages({ projectId }: AssociationIds, user: User) {
+    const url = `${Http.baseUrl()}/projects/${projectId}/work-packages/list`;
+    return Http.get(url, user) as unknown as Promise<ApiWorkPackage[]>;
+  }
+
+  static createWorkPackage({ projectId }: AssociationIds, apiWorkPackage: ApiWorkPackage, user: User) {
+    const url = `${Http.baseUrl()}/projects/${projectId}/work-packages`;
+    return Http.post(url, user, apiWorkPackage) as unknown as Promise<ApiWorkPackage>;
+  }
+
+  static deleteWorkPackage({ projectId }: AssociationIds, workPackageId: number, user: User) {
+    const url = `${Http.baseUrl()}/projects/${projectId}/work-packages/${workPackageId}`;
+    return Http.delete(url, user) as unknown as Promise<void>;
+  }
+
+  static updateWorkPackage({ projectId }: AssociationIds, workPackageId: number, apiWorkPackage: ApiWorkPackage & { trades: string[] }, user: User) {
+    const url = `${Http.baseUrl()}/projects/${projectId}/work-packages/${workPackageId}`;
+    return (Http.patch(url, user, apiWorkPackage) as unknown as Promise<ApiWorkPackage>);
+  }
+}
+
+makeErrorsPretty(WorkPackageApi);

package/source/avvir_api.ts

@@ -18,7 +18,9 @@ export default {
   recipes: Api.RecipeApi,
   reports: Api.ReportApi,
   scanDatasets: Api.ScanDatasetApi,
-  other: Api.WebGatewayApi,
-  webRpcApi: Api.WebRpcApi,
+  trades: Api.TradeApi,
   user: Api.UserApi,
+  webRpcApi: Api.WebRpcApi,
+  workPackages: Api.WorkPackageApi,
+  other: Api.WebGatewayApi,
 };

package/source/converters/floor_file_deletion_mode_converter.ts

@@ -1,20 +1,22 @@
 import _ from "underscore";
-import {ApiFloorFileDeletionMode} from "../models/api/ApiFloorFileDeletionMode";
+
+import ApiFloorFileDeletionMode from "../models/enums/api_floor_file_deletion_mode";
 
 const apiFloorFileDeletionModes = _.invert(ApiFloorFileDeletionMode);
 
 type ApiFloorFileDeletionModeKeys = keyof typeof ApiFloorFileDeletionMode;
 const apiFloorFileDeletionModeTypeKeys: ApiFloorFileDeletionModeKeys[] = Object.values(ApiFloorFileDeletionMode);
 
-const isApiFloorFileDeletionMode = (type: any): type is ApiFloorFileDeletionMode => apiFloorFileDeletionModeTypeKeys.includes(type);
+const isApiFloorFileDeletionMode = (type: any): type is ApiFloorFileDeletionMode => apiFloorFileDeletionModeTypeKeys.includes(
+  type);
 
 export class FloorFileDeletionModeConverter {
-    static toApiFloorFileDeletionMode(fileKey: ApiFloorFileDeletionMode): ApiFloorFileDeletionMode {
-        if (isApiFloorFileDeletionMode(fileKey)) {
-            return fileKey;
-        }
-        return apiFloorFileDeletionModes[fileKey];
+  static toApiFloorFileDeletionMode(fileKey: ApiFloorFileDeletionMode): ApiFloorFileDeletionMode {
+    if (isApiFloorFileDeletionMode(fileKey)) {
+      return fileKey;
     }
+    return apiFloorFileDeletionModes[fileKey];
+  }
 }
 
 export default FloorFileDeletionModeConverter;

package/source/models/api/api_action_payload.ts

@@ -1,4 +1,4 @@
-import {Vector3Like} from "./type_aliases";
+import type { Vector3Like } from "./type_aliases";
 
 export type ApiBehavioralData = {
   deviation?: Vector3Like
@@ -15,7 +15,8 @@ export class ApiActionPayload {
               photoSessionId: number,
               photoLocationId: number,
               scannedBuildingElementId: number,
-              behavioralData: ApiBehavioralData) {
+              behavioralData: ApiBehavioralData)
+  {
     this.globalId = globalId;
     this.firebaseClientAccountId = firebaseClientAccountId;
     this.firebaseProjectId = firebaseProjectId;
@@ -38,5 +39,6 @@ export class ApiActionPayload {
   photoLocationId?: number;
   scannedBuildingElementId?: number;
   behavioralData?: ApiBehavioralData;
-
 }
+
+export default ApiActionPayload;

package/source/models/api/api_argo_response.ts

@@ -10,7 +10,17 @@ export type ArgoMetadata = {
 }
 
 export class ApiArgoResponse {
-  constructor({ name, generateName, namespace, selfLink, uid, resourceVersion, generation, creationTimestamp }: Partial<ArgoMetadata> = {}) {
+  constructor({
+                name,
+                generateName,
+                namespace,
+                selfLink,
+                uid,
+                resourceVersion,
+                generation,
+                creationTimestamp
+              }: Partial<ArgoMetadata> = {})
+  {
     this.metadata = {
       name,
       generateName,

package/source/models/api/api_bcf_building_element.ts

@@ -1,10 +1,10 @@
-import {ApiDetailedElement} from "./api_detailed_element";
-import {ApiBcfIssue} from "./api_bcf_issue";
+import type { ApiBcfIssue } from "./api_bcf_issue";
+import type { ApiDetailedElement } from "./api_detailed_element";
 
-export type ApiBcfBuildingElementArgs = Partial<ApiBcfBuildingElement>;
+export type ApiBcfBuildingElementArgument = Partial<ApiBcfBuildingElement>;
 
 export class ApiBcfBuildingElement {
-  constructor({bcfIssue, detailedElement}: ApiBcfBuildingElementArgs = {}) {
+  constructor({ bcfIssue, detailedElement }: ApiBcfBuildingElementArgument = {}) {
     this.detailedElement = detailedElement;
     this.bcfIssue = bcfIssue;
   }

package/source/models/api/api_bcf_issue.ts

@@ -1,7 +1,7 @@
-export type ApiBcfIssueArgs = Partial<ApiBcfIssue>;
+export type ApiBcfIssueArgument = Partial<ApiBcfIssue>;
 
 export class ApiBcfIssue {
-  constructor({plannedBuildingElementId, commentGuid, viewpointGuid, topicGuid}: ApiBcfIssueArgs = {}) {
+  constructor({plannedBuildingElementId, commentGuid, viewpointGuid, topicGuid}: ApiBcfIssueArgument = {}) {
     this.plannedBuildingElementId = plannedBuildingElementId;
     this.commentGuid = commentGuid;
     this.topicGuid = topicGuid;

package/source/models/api/api_cloud_file.ts

@@ -1,25 +1,23 @@
-import { DateLike, Modify } from "./type_aliases";
 import { addInstantGetterAndSetterToApiModel, addReadOnlyPropertiesToModel } from "../../mixins";
 import { ApiProjectPurposeType, ApiPurposeType, isApiPurposeType } from "./api_purpose_type";
-import { PurposeTypeConverter } from "../../converters";
 import { AssociationType, isPurposeType, PurposeType } from "../enums";
-import ApiPhotoLocation3d from "./api_photo_location_3d";
+import { PurposeTypeConverter } from "../../converters";
+
+import type ApiPhotoLocation3d from "./api_photo_location_3d";
+import type { DateLike, ModifyPartial, Vector2Like } from "type_aliases";
 
 export type AvvirApiFiles<Type extends ApiPurposeType = ApiPurposeType> = { [purposeType in Type]?: ApiCloudFile | ApiCloudFile[] }
 export type AvvirApiFileIds<Type extends ApiPurposeType = ApiPurposeType> = { [purposeType in Type]?: number[] }
 
 export interface ApiCloudFileMetadata {
-  offset?: { x: number, y: number };
+  offset?: Vector2Like;
 }
 
-export interface ApiCloudFileArgument extends Partial<Modify<ApiCloudFile, {
+export type ApiCloudFileArgument = ModifyPartial<ApiCloudFile, {
   lastModified?: DateLike
   createdAt?: DateLike
   purposeType: ApiPurposeType | PurposeType,
-  fileType?: string
-}>>
-{
-}
+}>
 
 export class ApiCloudFile {
   constructor({

package/source/models/api/api_cloud_file_location_3d.ts

@@ -11,7 +11,7 @@ export type ApiCloudFileLocationId = {
   orientation: ApiQuaternion
 }
 
-export type ApiCloudFileLocation3dArguments = {
+export type ApiCloudFileLocation3dArgument = {
   id: number,
   position: Vector3Like,
   orientation: Vector4Like
@@ -25,7 +25,7 @@ export class ApiCloudFileLocation3d {
         id,
         position,
         orientation
-      }: ApiCloudFileLocation3dArguments ) {
+      }: ApiCloudFileLocation3dArgument ) {
     addReadOnlyPropertiesToModel(this, { id });
     this.position = position;
     this.orientation = ApiQuaternion.create(orientation);

package/source/models/api/api_construction_grid.ts

@@ -1,5 +1,6 @@
-import {addReadOnlyPropertiesToModel} from "../../mixins";
-import ApiGridLine from "./api_grid_line";
+import { addReadOnlyPropertiesToModel } from "../../mixins";
+
+import type ApiGridLine from "./api_grid_line";
 
 export class ApiConstructionGrid {
   constructor({ id, globalId, axisULines, axisVLines, firebaseFloorId }: Partial<ApiConstructionGrid>) {
@@ -10,8 +11,8 @@ export class ApiConstructionGrid {
 
   readonly id: number | null = null;
   readonly globalId: string | null = null;
-  axisULines: Array<ApiGridLine> = [];
-  axisVLines: Array<ApiGridLine> = [];
+  axisULines: ApiGridLine[] = [];
+  axisVLines: ApiGridLine[] = [];
   readonly firebaseFloorId: string | null = null;
 }
 

package/source/models/api/api_detailed_element.ts

@@ -1,27 +1,29 @@
-import {ApiPlannedElement} from "./api_planned_element";
-import {ApiBuiltStatus} from "../enums";
-import {ApiElementDeviation} from "./api_element_deviation";
-import {ApiScannedElementTypeMap, isDeviationScanResult} from "./api_scanned_element";
-import {addInstantGetterAndSetterToApiModel} from "../../mixins";
+import ApiElementDeviation from "./api_element_deviation";
+import ApiPlannedElement from "./api_planned_element";
+import { addInstantGetterAndSetterToApiModel } from "../../mixins";
+import { ApiScannedElementTypeMap, isDeviationScanResult } from "./api_scanned_element";
 
+import type { ApiBuiltStatus } from "../enums";
+
+/** @deprecated This information should now all live in the {@link ApiPlannedElement}. */
 export class ApiDetailedElement<Label extends ApiBuiltStatus = ApiBuiltStatus> extends ApiPlannedElement {
-    constructor(detailedElement: Partial<ApiDetailedElement<Label>> = {}) {
-        super(detailedElement);
-        addInstantGetterAndSetterToApiModel(this, "builtAt", detailedElement.builtAt);
-        addInstantGetterAndSetterToApiModel(this, "fixedAt", detailedElement.fixedAt);
-        this.scanResult = detailedElement.scanResult;
-        if (isDeviationScanResult(this.scanResult)) {
-            this.scanResult.deviation = { ...new ApiElementDeviation(this.scanResult.deviation) };
-        }
-        if (detailedElement.fixedDeviation) {
-            this.fixedDeviation = {...new ApiElementDeviation(detailedElement.fixedDeviation)};
-        }
+  constructor(detailedElement: Partial<ApiDetailedElement<Label>> = {}) {
+    super(detailedElement);
+    addInstantGetterAndSetterToApiModel(this, "builtAt", detailedElement.builtAt);
+    addInstantGetterAndSetterToApiModel(this, "fixedAt", detailedElement.fixedAt);
+    this.scanResult = detailedElement.scanResult;
+    if (isDeviationScanResult(this.scanResult)) {
+      this.scanResult.deviation = { ...new ApiElementDeviation(this.scanResult.deviation) };
+    }
+    if (detailedElement.fixedDeviation) {
+      this.fixedDeviation = { ...new ApiElementDeviation(detailedElement.fixedDeviation) };
     }
+  }
 
-    scanResult?: ApiScannedElementTypeMap[Label];
-    builtAt?: number;
-    fixedAt?: number;
-    fixedDeviation?: ApiElementDeviation;
+  scanResult?: ApiScannedElementTypeMap[Label];
+  builtAt?: number;
+  fixedAt?: number;
+  fixedDeviation?: ApiElementDeviation;
 }
 
 export default ApiDetailedElement;

package/source/models/api/api_element_deviation.ts

@@ -1,17 +1,26 @@
-import {Vector3Like} from "./type_aliases";
-import {DeviationStatus} from "../enums";
-import {Vector3} from "three";
+import { Vector3 } from "three";
+
+import { DeviationStatus } from "../enums";
+
+import type { ModifyPartial, Vector3Like } from "type_aliases";
+
+export type ApiElementDeviationArgument = ModifyPartial<ApiElementDeviation, {
+  deviationVectorMeters: Vector3Like
+}>
 
 export class ApiElementDeviation {
-  deviationVectorMeters: Vector3Like;
+  deviationVectorMeters: Vector3;
   deviationMeters: number;
   status: DeviationStatus;
+  /** @deprecated This is now stored as obstructing/obstructed id pairs and will be ignored */
   clashing: boolean;
 
-  constructor(deviation: Partial<ApiElementDeviation> = {}) {
+  constructor(deviation: ApiElementDeviationArgument = {}) {
     let deviationVector: Vector3;
     if (deviation?.deviationVectorMeters) {
-      deviationVector = new Vector3(deviation.deviationVectorMeters.x, deviation.deviationVectorMeters.y, deviation.deviationVectorMeters.z);
+      deviationVector = new Vector3(deviation.deviationVectorMeters.x,
+        deviation.deviationVectorMeters.y,
+        deviation.deviationVectorMeters.z);
     } else {
       deviationVector = new Vector3();
     }

package/source/models/api/api_floor.ts

@@ -1,17 +1,18 @@
+import { Matrix3 } from "three";
+
 import addInstantGetterAndSetterToApiModel from "../../mixins/add_instant_getter_and_setter_to_api_model";
 import addReadOnlyPropertiesToModel from "../../mixins/add_read_only_properties_to_model";
-import ApiConstructionGrid from "./api_construction_grid";
-import {DateLike, Matrix3Like, Modify, Vector2Like} from "./type_aliases";
-import ApiMatrix3 from "./api_matrix_3";
-import {Matrix3} from "three";
 import Matrix3Converter from "../../converters/matrix_3_converter";
 
-export interface ApiFloorArgument extends Partial<Modify<ApiFloor, {
+import type ApiConstructionGrid from "./api_construction_grid";
+import type ApiMatrix3 from "./api_matrix_3";
+import type { DateLike, Matrix3Like, ModifyPartial, Vector2Like } from "type_aliases";
+
+export type ApiFloorArgument = ModifyPartial<ApiFloor, {
   scanDate?: DateLike,
   photoAreaMinimapPixelToBimMinimapPixel?: Matrix3Like;
   bimMinimapToWorld?: Matrix3Like;
-}>> {
-}
+}>
 
 export class ApiFloor {
   constructor({
@@ -33,9 +34,10 @@ export class ApiFloor {
                 bimMinimapToWorld,
                 floorElevation,
                 globalOffsetYaw
-              }: ApiFloorArgument = {}) {
-    addInstantGetterAndSetterToApiModel(this, "scanDate");
-    addReadOnlyPropertiesToModel(this, {id, firebaseId, firebaseProjectId});
+              }: ApiFloorArgument = {})
+  {
+    addReadOnlyPropertiesToModel(this, { id, firebaseId, firebaseProjectId });
+    addInstantGetterAndSetterToApiModel(this, "scanDate", scanDate);
     let offsetVal: Vector2Like, photoMinimapToBimMinimapTransformVal: ApiMatrix3,
       bimMinimapToWorldTransformVal: ApiMatrix3;
     Object.defineProperties(this, {
@@ -45,7 +47,7 @@ export class ApiFloor {
         },
         set(val: Vector2Like) {
           if (val) {
-            offsetVal = {x: val.x, y: val.y};
+            offsetVal = { x: val.x, y: val.y };
           } else {
             offsetVal = null;
           }
@@ -137,7 +139,7 @@ export class ApiFloor {
   /**
    * An array of external identifiers of the capture datasets associated with this area.
    */
-  firebaseScanDatasetIds: Array<string> = [];
+  firebaseScanDatasetIds: string[];
 
   constructionGrid: ApiConstructionGrid | null = null;
   plannedElementCount: number | null = null;

package/source/models/api/api_grid_line.ts

@@ -1,5 +1,6 @@
 import { Vector2 } from "three";
-import { Vector2Like } from "./type_aliases";
+
+import type { Vector2Like } from "type_aliases";
 
 export class ApiGridLine {
   constructor({ name, point1, point2 }: Partial<ApiGridLine>) {

package/source/models/api/api_groups.ts

@@ -1,28 +1,29 @@
-import {addInstantGetterAndSetterToApiModel} from "../../mixins";
+import { addInstantGetterAndSetterToApiModel } from "../../mixins";
 
 export class ApiGroup {
-  id: number
-  name: string
+  id: number;
+  name: string;
   createdAt: number;
   createdBy: number;
   members: ApiGroupMember[];
   floorId: string;
+
   constructor({ id, name, createdAt, createdBy, members, floorId }: Partial<ApiGroup>) {
     this.id = id;
     this.name = name;
     this.createdBy = createdBy;
     this.members = members;
-    this.floorId = floorId
+    this.floorId = floorId;
     addInstantGetterAndSetterToApiModel(this, "createdAt", createdAt);
   }
 }
 
 
 export class ApiGroupMember {
-  id: number
-  groupId: number
-  memberType: string
-  elementId: string
+  id: number;
+  groupId: number;
+  memberType: string;
+  elementId: string;
 
   constructor({ id, groupId, memberType, elementId }: Partial<ApiGroupMember>) {
     this.id = id;
@@ -31,4 +32,4 @@ export class ApiGroupMember {
     this.memberType = memberType;
   }
 
-}
+}

package/source/models/api/api_inspect_report.ts

@@ -1,18 +1,29 @@
-import {addInstantGetterAndSetterToApiModel, addReadOnlyPropertiesToModel} from "../../mixins";
-import {ApiInspectReportEntry} from "./api_inspect_report_entry";
-import ApiUser from "./api_user";
+import { addInstantGetterAndSetterToApiModel, addReadOnlyPropertiesToModel } from "../../mixins";
+import { ApiInspectReportEntry, ApiInspectReportEntryArgument } from "./api_inspect_report_entry";
+
+import type ApiUser from "./api_user";
+import { DateLike, ModifyPartial } from "type_aliases";
+
+export type ApiInspectReportArgument = ModifyPartial<ApiInspectReport, {
+  entries: ApiInspectReportEntryArgument[]
+  createdAt: DateLike
+  createdBy: Partial<ApiUser>
+}>
 
 export class ApiInspectReport {
-    constructor({ id, firebaseProjectId, name, entries, createdBy, createdAt }: Partial<ApiInspectReport>) {
-        addReadOnlyPropertiesToModel(this, { id, firebaseProjectId, createdBy });
-        this.name = name;
-        this.entries = !!entries ? entries : [];
-        addInstantGetterAndSetterToApiModel(this, "createdAt", createdAt);
-    }
-    readonly id: number;
-    readonly firebaseProjectId: string;
-    name: string;
-    entries: ApiInspectReportEntry[];
-    createdAt?: number;
-    createdBy?: ApiUser;
-}
+  constructor({ id, firebaseProjectId, name, entries, createdBy, createdAt }: ApiInspectReportArgument) {
+    addReadOnlyPropertiesToModel(this, { id, firebaseProjectId, createdBy });
+    this.name = name;
+    this.entries = entries?.map(entry => new ApiInspectReportEntry(entry)) || [];
+    addInstantGetterAndSetterToApiModel(this, "createdAt", createdAt);
+  }
+
+  readonly id: number;
+  readonly firebaseProjectId: string;
+  name: string;
+  entries: ApiInspectReportEntry[];
+  createdAt?: number;
+  readonly createdBy?: ApiUser;
+}
+
+export default ApiInspectReport;

package/source/models/api/api_inspect_report_entry.ts

@@ -1,32 +1,56 @@
-import {addInstantGetterAndSetterToApiModel, addReadOnlyPropertiesToModel} from "../../mixins";
-import ApiUser from "./api_user";
-import ApiCloudFile from "./api_cloud_file";
-import ApiView from "./api_view";
-import {ApiInspectReportEntryElement} from "./api_inspect_report_entry_element";
+import { addInstantGetterAndSetterToApiModel, addReadOnlyPropertiesToModel } from "../../mixins";
+import ApiInspectReportEntryElement from "./api_inspect_report_entry_element";
+
+import type ApiUser from "./api_user";
+import type ApiCloudFile from "./api_cloud_file";
+import type ApiView from "./api_view";
+import type { DateLike, ModifyPartial } from "type_aliases";
+
+export type ApiInspectReportEntryArgument = ModifyPartial<ApiInspectReportEntry, {
+  createdAt: DateLike
+  elements: Partial<ApiInspectReportEntryElement>[]
+}>
 
 export class ApiInspectReportEntry {
-    constructor({ id, reportId, name, view, screenshot, minimapFile, zoomedMinimapFile, elements, createdBy, createdAt, obstructingTrades, obstructedTrades }: Partial<ApiInspectReportEntry>) {
-        addReadOnlyPropertiesToModel(this, { id, reportId, createdBy });
-        addInstantGetterAndSetterToApiModel(this, "createdAt", createdAt);
-        this.name = name;
-        this.view = view;
-        this.screenshot = screenshot;
-        this.minimapFile = minimapFile;
-        this.zoomedMinimapFile = zoomedMinimapFile;
-        this.elements = elements;
-        this.obstructingTrades = obstructingTrades;
-        this.obstructedTrades = obstructedTrades;
-    }
-    readonly id: number;
-    readonly reportId: number;
-    name: string;
-    view: ApiView;
-    screenshot: ApiCloudFile;
-    minimapFile: ApiCloudFile;
-    zoomedMinimapFile: ApiCloudFile;
-    elements: ApiInspectReportEntryElement[];
-    obstructedTrades?: string[];
-    obstructingTrades?: string[]
-    createdAt?: number;
-    createdBy?: ApiUser;
-}
+  constructor({
+                id,
+                reportId,
+                name,
+                view,
+                screenshot,
+                minimapFile,
+                zoomedMinimapFile,
+                elements,
+                createdBy,
+                createdAt,
+                obstructingTrades,
+                obstructedTrades
+              }: ApiInspectReportEntryArgument)
+  {
+    addReadOnlyPropertiesToModel(this, { id, reportId, createdBy });
+    addInstantGetterAndSetterToApiModel(this, "createdAt", createdAt);
+    this.name = name;
+    this.view = view;
+    this.screenshot = screenshot;
+    this.minimapFile = minimapFile;
+    this.zoomedMinimapFile = zoomedMinimapFile;
+    this.elements = elements?.map(element => new ApiInspectReportEntryElement(element)) || [];
+    this.obstructingTrades = obstructingTrades || [];
+    this.obstructedTrades = obstructedTrades || [];
+  }
+
+  readonly id: number;
+  readonly reportId: number;
+  name: string;
+  view: ApiView;
+  screenshot: ApiCloudFile;
+  minimapFile: ApiCloudFile;
+  zoomedMinimapFile: ApiCloudFile;
+  elements: ApiInspectReportEntryElement[];
+  obstructedTrades?: string[];
+  obstructingTrades?: string[];
+  createdAt?: number;
+  createdBy?: ApiUser;
+}
+
+export default ApiInspectReportEntry;

package/source/models/api/api_inspect_report_entry_element.ts

@@ -1,26 +1,29 @@
-import {Vector3} from "three";
+import type { Vector3 } from "three";
 
 export class ApiInspectReportEntryElement {
-    constructor({masterformatCode, builtStatus, deviationVectorMeters, globalId, name}) {
-        this.masterformatCode = masterformatCode;
-        this.builtStatus = builtStatus;
-        this.deviationVectorMeters = deviationVectorMeters
-        this.globalId = globalId;
-        this.name = name;
-    }
-    masterformatCode: string;
-    builtStatus: string;
-    deviationVectorMeters: Vector3;
-    globalId: string;
-    name: string;
+  constructor({ masterformatCode, builtStatus, deviationVectorMeters, globalId, name }: Partial<ApiInspectReportEntryElement> = {}) {
+    this.masterformatCode = masterformatCode;
+    this.builtStatus = builtStatus;
+    this.deviationVectorMeters = deviationVectorMeters;
+    this.globalId = globalId;
+    this.name = name;
+  }
 
-    static plannedBuildingElementToApiInspectReportEntry(element, level1Masterformat): ApiInspectReportEntryElement {
-        return new ApiInspectReportEntryElement({
-            masterformatCode: level1Masterformat,
-            globalId: element.globalId,
-            deviationVectorMeters: element.deviationVectorMeters,
-            builtStatus: element.builtStatus,
-            name: element.name
-        })
-    }
-}
+  masterformatCode: string;
+  builtStatus: string;
+  deviationVectorMeters: Vector3;
+  globalId: string;
+  name: string;
+
+  static plannedBuildingElementToApiInspectReportEntry(element, level1Masterformat): ApiInspectReportEntryElement {
+    return new ApiInspectReportEntryElement({
+      masterformatCode: level1Masterformat,
+      globalId: element.globalId,
+      deviationVectorMeters: element.deviationVectorMeters,
+      builtStatus: element.builtStatus,
+      name: element.name
+    });
+  }
+}
+
+export default ApiInspectReportEntryElement;