@digital8/security-registers-backend-ts-sdk 0.0.446 → 0.0.447

package/README.md

@@ -1,4 +1,4 @@
-## @digital8/security-registers-backend-ts-sdk@0.0.446
+## @digital8/security-registers-backend-ts-sdk@0.0.447
 
 This generator creates TypeScript/JavaScript client that utilizes [Fetch API](https://fetch.spec.whatwg.org/). The generated Node module can be used in the following environments:
 
@@ -36,7 +36,7 @@ navigate to the folder of your consuming project and run one of the following co
 _published:_
 
 ```
-npm install @digital8/security-registers-backend-ts-sdk@0.0.446 --save
+npm install @digital8/security-registers-backend-ts-sdk@0.0.447 --save
 ```
 
 _unPublished (not recommended):_

package/dist/models/AddressResource.d.ts

@@ -32,7 +32,7 @@ export interface AddressResource {
      * @type {string}
      * @memberof AddressResource
      */
-    addressLine2: string;
+    addressLine2?: string | null;
     /**
      *
      * @type {string}

package/dist/models/AddressResource.js

@@ -24,8 +24,6 @@ exports.AddressResourceToJSONTyped = AddressResourceToJSONTyped;
 function instanceOfAddressResource(value) {
     if (!('addressLine1' in value) || value['addressLine1'] === undefined)
         return false;
-    if (!('addressLine2' in value) || value['addressLine2'] === undefined)
-        return false;
     if (!('suburb' in value) || value['suburb'] === undefined)
         return false;
     if (!('city' in value) || value['city'] === undefined)
@@ -50,7 +48,7 @@ function AddressResourceFromJSONTyped(json, ignoreDiscriminator) {
     return {
         'id': json['id'] == null ? undefined : json['id'],
         'addressLine1': json['addressLine1'],
-        'addressLine2': json['addressLine2'],
+        'addressLine2': json['addressLine2'] == null ? undefined : json['addressLine2'],
         'suburb': json['suburb'],
         'city': json['city'],
         'state': json['state'],

package/dist/models/IncidentListResource.d.ts

@@ -44,10 +44,10 @@ export interface IncidentListResource {
     user?: UserLiteResource;
     /**
      *
-     * @type {UserLiteResource}
+     * @type {string}
      * @memberof IncidentListResource
      */
-    approvedByUser?: UserLiteResource;
+    approvedBy?: string | null;
     /**
      *
      * @type {string}

package/dist/models/IncidentListResource.js

@@ -43,7 +43,7 @@ function IncidentListResourceFromJSONTyped(json, ignoreDiscriminator) {
         'venue': json['venue'] == null ? undefined : (0, VenueLiteResource_1.VenueLiteResourceFromJSON)(json['venue']),
         'securityCompany': json['securityCompany'] == null ? undefined : (0, SecurityCompanyLiteResource_1.SecurityCompanyLiteResourceFromJSON)(json['securityCompany']),
         'user': json['user'] == null ? undefined : (0, UserLiteResource_1.UserLiteResourceFromJSON)(json['user']),
-        'approvedByUser': json['approvedByUser'] == null ? undefined : (0, UserLiteResource_1.UserLiteResourceFromJSON)(json['approvedByUser']),
+        'approvedBy': json['approvedBy'] == null ? undefined : json['approvedBy'],
         'title': json['title'] == null ? undefined : json['title'],
         'dutyManager': json['dutyManager'] == null ? undefined : json['dutyManager'],
         'incidentDateTime': json['incidentDateTime'] == null ? undefined : (new Date(json['incidentDateTime'])),
@@ -69,7 +69,7 @@ function IncidentListResourceToJSONTyped(value, ignoreDiscriminator) {
         'venue': (0, VenueLiteResource_1.VenueLiteResourceToJSON)(value['venue']),
         'securityCompany': (0, SecurityCompanyLiteResource_1.SecurityCompanyLiteResourceToJSON)(value['securityCompany']),
         'user': (0, UserLiteResource_1.UserLiteResourceToJSON)(value['user']),
-        'approvedByUser': (0, UserLiteResource_1.UserLiteResourceToJSON)(value['approvedByUser']),
+        'approvedBy': value['approvedBy'],
         'title': value['title'],
         'dutyManager': value['dutyManager'],
         'incidentDateTime': value['incidentDateTime'] === null ? null : ((_a = value['incidentDateTime']) === null || _a === void 0 ? void 0 : _a.toISOString()),

package/dist/models/IncidentResource.d.ts

@@ -64,19 +64,19 @@ export interface IncidentResource {
      * @type {UserLiteResource}
      * @memberof IncidentResource
      */
-    approvedByUser: UserLiteResource | null;
+    primaryManager: UserLiteResource | null;
     /**
      *
-     * @type {UserLiteResource}
+     * @type {IncidentFieldSchemaResource}
      * @memberof IncidentResource
      */
-    primaryManager: UserLiteResource | null;
+    incidentFieldSchema: IncidentFieldSchemaResource | null;
     /**
      *
-     * @type {IncidentFieldSchemaResource}
+     * @type {string}
      * @memberof IncidentResource
      */
-    incidentFieldSchema: IncidentFieldSchemaResource | null;
+    approvedBy?: string | null;
     /**
      *
      * @type {Date}

package/dist/models/IncidentResource.js

@@ -42,8 +42,6 @@ function instanceOfIncidentResource(value) {
         return false;
     if (!('user' in value) || value['user'] === undefined)
         return false;
-    if (!('approvedByUser' in value) || value['approvedByUser'] === undefined)
-        return false;
     if (!('primaryManager' in value) || value['primaryManager'] === undefined)
         return false;
     if (!('incidentFieldSchema' in value) || value['incidentFieldSchema'] === undefined)
@@ -70,9 +68,9 @@ function IncidentResourceFromJSONTyped(json, ignoreDiscriminator) {
         'roster': (0, RosterLiteResource_1.RosterLiteResourceFromJSON)(json['roster']),
         'register': (0, RegisterLiteResource_1.RegisterLiteResourceFromJSON)(json['register']),
         'user': (0, UserLiteResource_1.UserLiteResourceFromJSON)(json['user']),
-        'approvedByUser': (0, UserLiteResource_1.UserLiteResourceFromJSON)(json['approvedByUser']),
         'primaryManager': (0, UserLiteResource_1.UserLiteResourceFromJSON)(json['primaryManager']),
         'incidentFieldSchema': (0, IncidentFieldSchemaResource_1.IncidentFieldSchemaResourceFromJSON)(json['incidentFieldSchema']),
+        'approvedBy': json['approvedBy'] == null ? undefined : json['approvedBy'],
         'approvedAt': json['approvedAt'] == null ? undefined : (new Date(json['approvedAt'])),
         'createdAt': json['createdAt'] == null ? undefined : (new Date(json['createdAt'])),
         'updatedAt': json['updatedAt'] == null ? undefined : (new Date(json['updatedAt'])),
@@ -98,9 +96,9 @@ function IncidentResourceToJSONTyped(value, ignoreDiscriminator) {
         'roster': (0, RosterLiteResource_1.RosterLiteResourceToJSON)(value['roster']),
         'register': (0, RegisterLiteResource_1.RegisterLiteResourceToJSON)(value['register']),
         'user': (0, UserLiteResource_1.UserLiteResourceToJSON)(value['user']),
-        'approvedByUser': (0, UserLiteResource_1.UserLiteResourceToJSON)(value['approvedByUser']),
         'primaryManager': (0, UserLiteResource_1.UserLiteResourceToJSON)(value['primaryManager']),
         'incidentFieldSchema': (0, IncidentFieldSchemaResource_1.IncidentFieldSchemaResourceToJSON)(value['incidentFieldSchema']),
+        'approvedBy': value['approvedBy'],
         'approvedAt': value['approvedAt'] === null ? null : ((_a = value['approvedAt']) === null || _a === void 0 ? void 0 : _a.toISOString()),
         'createdAt': value['createdAt'] === null ? null : ((_b = value['createdAt']) === null || _b === void 0 ? void 0 : _b.toISOString()),
         'updatedAt': value['updatedAt'] === null ? null : ((_c = value['updatedAt']) === null || _c === void 0 ? void 0 : _c.toISOString()),

package/dist/models/IncidentsApproveRequest.d.ts

@@ -17,10 +17,10 @@
 export interface IncidentsApproveRequest {
     /**
      *
-     * @type {number}
+     * @type {string}
      * @memberof IncidentsApproveRequest
      */
-    userId: number;
+    approvedBy: string;
 }
 /**
  * Check if a given object implements the IncidentsApproveRequest interface.

package/dist/models/IncidentsApproveRequest.js

@@ -22,7 +22,7 @@ exports.IncidentsApproveRequestToJSONTyped = IncidentsApproveRequestToJSONTyped;
  * Check if a given object implements the IncidentsApproveRequest interface.
  */
 function instanceOfIncidentsApproveRequest(value) {
-    if (!('userId' in value) || value['userId'] === undefined)
+    if (!('approvedBy' in value) || value['approvedBy'] === undefined)
         return false;
     return true;
 }
@@ -34,7 +34,7 @@ function IncidentsApproveRequestFromJSONTyped(json, ignoreDiscriminator) {
         return json;
     }
     return {
-        'userId': json['user_id'],
+        'approvedBy': json['approved_by'],
     };
 }
 function IncidentsApproveRequestToJSON(json) {
@@ -46,6 +46,6 @@ function IncidentsApproveRequestToJSONTyped(value, ignoreDiscriminator) {
         return value;
     }
     return {
-        'user_id': value['userId'],
+        'approved_by': value['approvedBy'],
     };
 }

package/dist/models/IncidentsExportCsvBulkRequest.d.ts

@@ -39,12 +39,6 @@ export interface IncidentsExportCsvBulkRequest {
      * @memberof IncidentsExportCsvBulkRequest
      */
     userId?: Array<string>;
-    /**
-     *
-     * @type {Array<string>}
-     * @memberof IncidentsExportCsvBulkRequest
-     */
-    approvedByUserId?: Array<string>;
     /**
      *
      * @type {Array<string>}

package/dist/models/IncidentsExportCsvBulkRequest.js

@@ -42,7 +42,6 @@ function IncidentsExportCsvBulkRequestFromJSONTyped(json, ignoreDiscriminator) {
         'rosterId': json['roster_id'] == null ? undefined : json['roster_id'],
         'registerId': json['register_id'] == null ? undefined : json['register_id'],
         'userId': json['user_id'] == null ? undefined : json['user_id'],
-        'approvedByUserId': json['approved_by_user_id'] == null ? undefined : json['approved_by_user_id'],
         'hasApprovedAt': json['has_approved_at'] == null ? undefined : json['has_approved_at'],
         'submittedByGuard': json['submitted_by_guard'] == null ? undefined : json['submitted_by_guard'],
         'venueId': json['venue_id'],
@@ -64,7 +63,6 @@ function IncidentsExportCsvBulkRequestToJSONTyped(value, ignoreDiscriminator) {
         'roster_id': value['rosterId'],
         'register_id': value['registerId'],
         'user_id': value['userId'],
-        'approved_by_user_id': value['approvedByUserId'],
         'has_approved_at': value['hasApprovedAt'],
         'submitted_by_guard': value['submittedByGuard'],
         'venue_id': value['venueId'],

package/dist/models/IncidentsExportPdfBulkRequest.d.ts

@@ -39,12 +39,6 @@ export interface IncidentsExportPdfBulkRequest {
      * @memberof IncidentsExportPdfBulkRequest
      */
     userId?: Array<string>;
-    /**
-     *
-     * @type {Array<string>}
-     * @memberof IncidentsExportPdfBulkRequest
-     */
-    approvedByUserId?: Array<string>;
     /**
      *
      * @type {Array<string>}

package/dist/models/IncidentsExportPdfBulkRequest.js

@@ -42,7 +42,6 @@ function IncidentsExportPdfBulkRequestFromJSONTyped(json, ignoreDiscriminator) {
         'rosterId': json['roster_id'] == null ? undefined : json['roster_id'],
         'registerId': json['register_id'] == null ? undefined : json['register_id'],
         'userId': json['user_id'] == null ? undefined : json['user_id'],
-        'approvedByUserId': json['approved_by_user_id'] == null ? undefined : json['approved_by_user_id'],
         'hasApprovedAt': json['has_approved_at'] == null ? undefined : json['has_approved_at'],
         'submittedByGuard': json['submitted_by_guard'] == null ? undefined : json['submitted_by_guard'],
         'venueId': json['venue_id'],
@@ -64,7 +63,6 @@ function IncidentsExportPdfBulkRequestToJSONTyped(value, ignoreDiscriminator) {
         'roster_id': value['rosterId'],
         'register_id': value['registerId'],
         'user_id': value['userId'],
-        'approved_by_user_id': value['approvedByUserId'],
         'has_approved_at': value['hasApprovedAt'],
         'submitted_by_guard': value['submittedByGuard'],
         'venue_id': value['venueId'],

package/dist/models/IncidentsListRequest.d.ts

@@ -75,12 +75,6 @@ export interface IncidentsListRequest {
      * @memberof IncidentsListRequest
      */
     userId?: Array<string>;
-    /**
-     *
-     * @type {Array<string>}
-     * @memberof IncidentsListRequest
-     */
-    approvedByUserId?: Array<string>;
     /**
      *
      * @type {Array<string>}

package/dist/models/IncidentsListRequest.js

@@ -58,7 +58,6 @@ function IncidentsListRequestFromJSONTyped(json, ignoreDiscriminator) {
         'rosterId': json['roster_id'] == null ? undefined : json['roster_id'],
         'registerId': json['register_id'] == null ? undefined : json['register_id'],
         'userId': json['user_id'] == null ? undefined : json['user_id'],
-        'approvedByUserId': json['approved_by_user_id'] == null ? undefined : json['approved_by_user_id'],
         'hasApprovedAt': json['has_approved_at'] == null ? undefined : json['has_approved_at'],
         'submittedByGuard': json['submitted_by_guard'] == null ? undefined : json['submitted_by_guard'],
         'beforeApprovedAt': json['before_approved_at'] == null ? undefined : (new Date(json['before_approved_at'])),
@@ -89,7 +88,6 @@ function IncidentsListRequestToJSONTyped(value, ignoreDiscriminator) {
         'roster_id': value['rosterId'],
         'register_id': value['registerId'],
         'user_id': value['userId'],
-        'approved_by_user_id': value['approvedByUserId'],
         'has_approved_at': value['hasApprovedAt'],
         'submitted_by_guard': value['submittedByGuard'],
         'before_approved_at': value['beforeApprovedAt'] == null ? undefined : ((value['beforeApprovedAt']).toISOString()),

package/dist/models/RegisterListResource.d.ts

@@ -46,13 +46,13 @@ export interface RegisterListResource {
      * @type {Date}
      * @memberof RegisterListResource
      */
-    finishDateTime: Date;
+    finishDateTime?: Date | null;
     /**
      *
-     * @type {string}
+     * @type {object}
      * @memberof RegisterListResource
      */
-    shiftLength: string;
+    shiftLength: object;
     /**
      *
      * @type {number}
@@ -148,7 +148,7 @@ export interface RegisterListResource {
      * @type {number}
      * @memberof RegisterListResource
      */
-    signOffLat: number;
+    signOffLat?: number | null;
     /**
      *
      * @type {number}

package/dist/models/RegisterListResource.js

@@ -39,8 +39,6 @@ function instanceOfRegisterListResource(value) {
         return false;
     if (!('startDateTime' in value) || value['startDateTime'] === undefined)
         return false;
-    if (!('finishDateTime' in value) || value['finishDateTime'] === undefined)
-        return false;
     if (!('shiftLength' in value) || value['shiftLength'] === undefined)
         return false;
     if (!('signOffStatus' in value) || value['signOffStatus'] === undefined)
@@ -71,8 +69,6 @@ function instanceOfRegisterListResource(value) {
         return false;
     if (!('signOnLong' in value) || value['signOnLong'] === undefined)
         return false;
-    if (!('signOffLat' in value) || value['signOffLat'] === undefined)
-        return false;
     if (!('signOffLong' in value) || value['signOffLong'] === undefined)
         return false;
     if (!('hasIncidents' in value) || value['hasIncidents'] === undefined)
@@ -91,7 +87,7 @@ function RegisterListResourceFromJSONTyped(json, ignoreDiscriminator) {
         'user': (0, UserLiteResource_1.UserLiteResourceFromJSON)(json['user']),
         'venue': (0, VenueLiteResource_1.VenueLiteResourceFromJSON)(json['venue']),
         'startDateTime': (new Date(json['startDateTime'])),
-        'finishDateTime': (new Date(json['finishDateTime'])),
+        'finishDateTime': json['finishDateTime'] == null ? undefined : (new Date(json['finishDateTime'])),
         'shiftLength': json['shiftLength'],
         'signOffStatus': json['signOffStatus'],
         'badgeNumber': json['badgeNumber'] == null ? undefined : json['badgeNumber'],
@@ -108,7 +104,7 @@ function RegisterListResourceFromJSONTyped(json, ignoreDiscriminator) {
         'firstAid': json['firstAid'],
         'signOnLat': json['signOnLat'],
         'signOnLong': json['signOnLong'],
-        'signOffLat': json['signOffLat'],
+        'signOffLat': json['signOffLat'] == null ? undefined : json['signOffLat'],
         'signOffLong': json['signOffLong'],
         'hasIncidents': json['hasIncidents'],
     };
@@ -117,6 +113,7 @@ function RegisterListResourceToJSON(json) {
     return RegisterListResourceToJSONTyped(json, false);
 }
 function RegisterListResourceToJSONTyped(value, ignoreDiscriminator) {
+    var _a;
     if (ignoreDiscriminator === void 0) { ignoreDiscriminator = false; }
     if (value == null) {
         return value;
@@ -126,7 +123,7 @@ function RegisterListResourceToJSONTyped(value, ignoreDiscriminator) {
         'user': (0, UserLiteResource_1.UserLiteResourceToJSON)(value['user']),
         'venue': (0, VenueLiteResource_1.VenueLiteResourceToJSON)(value['venue']),
         'startDateTime': ((value['startDateTime']).toISOString()),
-        'finishDateTime': ((value['finishDateTime']).toISOString()),
+        'finishDateTime': value['finishDateTime'] === null ? null : ((_a = value['finishDateTime']) === null || _a === void 0 ? void 0 : _a.toISOString()),
         'shiftLength': value['shiftLength'],
         'signOffStatus': value['signOffStatus'],
         'badgeNumber': value['badgeNumber'],

package/dist/models/RosterLiteResource.d.ts

@@ -32,7 +32,7 @@ export interface RosterLiteResource {
      * @type {Date}
      * @memberof RosterLiteResource
      */
-    finishDateTime: Date;
+    finishDateTime?: Date | null;
 }
 /**
  * Check if a given object implements the RosterLiteResource interface.

package/dist/models/RosterLiteResource.js

@@ -24,8 +24,6 @@ exports.RosterLiteResourceToJSONTyped = RosterLiteResourceToJSONTyped;
 function instanceOfRosterLiteResource(value) {
     if (!('startDateTime' in value) || value['startDateTime'] === undefined)
         return false;
-    if (!('finishDateTime' in value) || value['finishDateTime'] === undefined)
-        return false;
     return true;
 }
 function RosterLiteResourceFromJSON(json) {
@@ -38,13 +36,14 @@ function RosterLiteResourceFromJSONTyped(json, ignoreDiscriminator) {
     return {
         'id': json['id'] == null ? undefined : json['id'],
         'startDateTime': (new Date(json['startDateTime'])),
-        'finishDateTime': (new Date(json['finishDateTime'])),
+        'finishDateTime': json['finishDateTime'] == null ? undefined : (new Date(json['finishDateTime'])),
     };
 }
 function RosterLiteResourceToJSON(json) {
     return RosterLiteResourceToJSONTyped(json, false);
 }
 function RosterLiteResourceToJSONTyped(value, ignoreDiscriminator) {
+    var _a;
     if (ignoreDiscriminator === void 0) { ignoreDiscriminator = false; }
     if (value == null) {
         return value;
@@ -52,6 +51,6 @@ function RosterLiteResourceToJSONTyped(value, ignoreDiscriminator) {
     return {
         'id': value['id'],
         'startDateTime': ((value['startDateTime']).toISOString()),
-        'finishDateTime': ((value['finishDateTime']).toISOString()),
+        'finishDateTime': value['finishDateTime'] === null ? null : ((_a = value['finishDateTime']) === null || _a === void 0 ? void 0 : _a.toISOString()),
     };
 }

package/dist/models/RosterWithRegistersResource.d.ts

@@ -53,7 +53,7 @@ export interface RosterWithRegistersResource {
      * @type {Date}
      * @memberof RosterWithRegistersResource
      */
-    finishDateTime: Date;
+    finishDateTime?: Date | null;
     /**
      *
      * @type {boolean}

package/dist/models/RosterWithRegistersResource.js

@@ -42,8 +42,6 @@ function instanceOfRosterWithRegistersResource(value) {
         return false;
     if (!('startDateTime' in value) || value['startDateTime'] === undefined)
         return false;
-    if (!('finishDateTime' in value) || value['finishDateTime'] === undefined)
-        return false;
     if (!('isCompliant' in value) || value['isCompliant'] === undefined)
         return false;
     if (!('isComplete' in value) || value['isComplete'] === undefined)
@@ -67,7 +65,7 @@ function RosterWithRegistersResourceFromJSONTyped(json, ignoreDiscriminator) {
         'state': json['state'],
         'securityCompany': (0, SecurityCompanyLiteResource_1.SecurityCompanyLiteResourceFromJSON)(json['securityCompany']),
         'startDateTime': (new Date(json['startDateTime'])),
-        'finishDateTime': (new Date(json['finishDateTime'])),
+        'finishDateTime': json['finishDateTime'] == null ? undefined : (new Date(json['finishDateTime'])),
         'isCompliant': json['isCompliant'],
         'isComplete': json['isComplete'],
         'signOffStatus': json['signOffStatus'],
@@ -78,6 +76,7 @@ function RosterWithRegistersResourceToJSON(json) {
     return RosterWithRegistersResourceToJSONTyped(json, false);
 }
 function RosterWithRegistersResourceToJSONTyped(value, ignoreDiscriminator) {
+    var _a;
     if (ignoreDiscriminator === void 0) { ignoreDiscriminator = false; }
     if (value == null) {
         return value;
@@ -88,7 +87,7 @@ function RosterWithRegistersResourceToJSONTyped(value, ignoreDiscriminator) {
         'state': value['state'],
         'securityCompany': (0, SecurityCompanyLiteResource_1.SecurityCompanyLiteResourceToJSON)(value['securityCompany']),
         'startDateTime': ((value['startDateTime']).toISOString()),
-        'finishDateTime': ((value['finishDateTime']).toISOString()),
+        'finishDateTime': value['finishDateTime'] === null ? null : ((_a = value['finishDateTime']) === null || _a === void 0 ? void 0 : _a.toISOString()),
         'isCompliant': value['isCompliant'],
         'isComplete': value['isComplete'],
         'signOffStatus': value['signOffStatus'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digital8/security-registers-backend-ts-sdk",
-  "version": "0.0.446",
+  "version": "0.0.447",
   "description": "OpenAPI client for @digital8/security-registers-backend-ts-sdk",
   "author": "OpenAPI-Generator",
   "repository": {

package/src/models/AddressResource.ts

@@ -36,7 +36,7 @@ export interface AddressResource {
      * @type {string}
      * @memberof AddressResource
      */
-    addressLine2: string;
+    addressLine2?: string | null;
     /**
      * 
      * @type {string}
@@ -80,7 +80,6 @@ export interface AddressResource {
  */
 export function instanceOfAddressResource(value: object): value is AddressResource {
     if (!('addressLine1' in value) || value['addressLine1'] === undefined) return false;
-    if (!('addressLine2' in value) || value['addressLine2'] === undefined) return false;
     if (!('suburb' in value) || value['suburb'] === undefined) return false;
     if (!('city' in value) || value['city'] === undefined) return false;
     if (!('state' in value) || value['state'] === undefined) return false;
@@ -102,7 +101,7 @@ export function AddressResourceFromJSONTyped(json: any, ignoreDiscriminator: boo
         
         'id': json['id'] == null ? undefined : json['id'],
         'addressLine1': json['addressLine1'],
-        'addressLine2': json['addressLine2'],
+        'addressLine2': json['addressLine2'] == null ? undefined : json['addressLine2'],
         'suburb': json['suburb'],
         'city': json['city'],
         'state': json['state'],

package/src/models/IncidentListResource.ts

@@ -67,10 +67,10 @@ export interface IncidentListResource {
     user?: UserLiteResource;
     /**
      * 
-     * @type {UserLiteResource}
+     * @type {string}
      * @memberof IncidentListResource
      */
-    approvedByUser?: UserLiteResource;
+    approvedBy?: string | null;
     /**
      * 
      * @type {string}
@@ -150,7 +150,7 @@ export function IncidentListResourceFromJSONTyped(json: any, ignoreDiscriminator
         'venue': json['venue'] == null ? undefined : VenueLiteResourceFromJSON(json['venue']),
         'securityCompany': json['securityCompany'] == null ? undefined : SecurityCompanyLiteResourceFromJSON(json['securityCompany']),
         'user': json['user'] == null ? undefined : UserLiteResourceFromJSON(json['user']),
-        'approvedByUser': json['approvedByUser'] == null ? undefined : UserLiteResourceFromJSON(json['approvedByUser']),
+        'approvedBy': json['approvedBy'] == null ? undefined : json['approvedBy'],
         'title': json['title'] == null ? undefined : json['title'],
         'dutyManager': json['dutyManager'] == null ? undefined : json['dutyManager'],
         'incidentDateTime': json['incidentDateTime'] == null ? undefined : (new Date(json['incidentDateTime'])),
@@ -178,7 +178,7 @@ export function IncidentListResourceToJSONTyped(value?: IncidentListResource | n
         'venue': VenueLiteResourceToJSON(value['venue']),
         'securityCompany': SecurityCompanyLiteResourceToJSON(value['securityCompany']),
         'user': UserLiteResourceToJSON(value['user']),
-        'approvedByUser': UserLiteResourceToJSON(value['approvedByUser']),
+        'approvedBy': value['approvedBy'],
         'title': value['title'],
         'dutyManager': value['dutyManager'],
         'incidentDateTime': value['incidentDateTime'] === null ? null : ((value['incidentDateTime'] as any)?.toISOString()),

package/src/models/IncidentResource.ts

@@ -117,19 +117,19 @@ export interface IncidentResource {
      * @type {UserLiteResource}
      * @memberof IncidentResource
      */
-    approvedByUser: UserLiteResource | null;
+    primaryManager: UserLiteResource | null;
     /**
      * 
-     * @type {UserLiteResource}
+     * @type {IncidentFieldSchemaResource}
      * @memberof IncidentResource
      */
-    primaryManager: UserLiteResource | null;
+    incidentFieldSchema: IncidentFieldSchemaResource | null;
     /**
      * 
-     * @type {IncidentFieldSchemaResource}
+     * @type {string}
      * @memberof IncidentResource
      */
-    incidentFieldSchema: IncidentFieldSchemaResource | null;
+    approvedBy?: string | null;
     /**
      * 
      * @type {Date}
@@ -184,7 +184,6 @@ export function instanceOfIncidentResource(value: object): value is IncidentReso
     if (!('roster' in value) || value['roster'] === undefined) return false;
     if (!('register' in value) || value['register'] === undefined) return false;
     if (!('user' in value) || value['user'] === undefined) return false;
-    if (!('approvedByUser' in value) || value['approvedByUser'] === undefined) return false;
     if (!('primaryManager' in value) || value['primaryManager'] === undefined) return false;
     if (!('incidentFieldSchema' in value) || value['incidentFieldSchema'] === undefined) return false;
     if (!('fields' in value) || value['fields'] === undefined) return false;
@@ -209,9 +208,9 @@ export function IncidentResourceFromJSONTyped(json: any, ignoreDiscriminator: bo
         'roster': RosterLiteResourceFromJSON(json['roster']),
         'register': RegisterLiteResourceFromJSON(json['register']),
         'user': UserLiteResourceFromJSON(json['user']),
-        'approvedByUser': UserLiteResourceFromJSON(json['approvedByUser']),
         'primaryManager': UserLiteResourceFromJSON(json['primaryManager']),
         'incidentFieldSchema': IncidentFieldSchemaResourceFromJSON(json['incidentFieldSchema']),
+        'approvedBy': json['approvedBy'] == null ? undefined : json['approvedBy'],
         'approvedAt': json['approvedAt'] == null ? undefined : (new Date(json['approvedAt'])),
         'createdAt': json['createdAt'] == null ? undefined : (new Date(json['createdAt'])),
         'updatedAt': json['updatedAt'] == null ? undefined : (new Date(json['updatedAt'])),
@@ -239,9 +238,9 @@ export function IncidentResourceToJSONTyped(value?: IncidentResource | null, ign
         'roster': RosterLiteResourceToJSON(value['roster']),
         'register': RegisterLiteResourceToJSON(value['register']),
         'user': UserLiteResourceToJSON(value['user']),
-        'approvedByUser': UserLiteResourceToJSON(value['approvedByUser']),
         'primaryManager': UserLiteResourceToJSON(value['primaryManager']),
         'incidentFieldSchema': IncidentFieldSchemaResourceToJSON(value['incidentFieldSchema']),
+        'approvedBy': value['approvedBy'],
         'approvedAt': value['approvedAt'] === null ? null : ((value['approvedAt'] as any)?.toISOString()),
         'createdAt': value['createdAt'] === null ? null : ((value['createdAt'] as any)?.toISOString()),
         'updatedAt': value['updatedAt'] === null ? null : ((value['updatedAt'] as any)?.toISOString()),

package/src/models/IncidentsApproveRequest.ts

@@ -21,17 +21,17 @@ import { mapValues } from '../runtime';
 export interface IncidentsApproveRequest {
     /**
      * 
-     * @type {number}
+     * @type {string}
      * @memberof IncidentsApproveRequest
      */
-    userId: number;
+    approvedBy: string;
 }
 
 /**
  * Check if a given object implements the IncidentsApproveRequest interface.
  */
 export function instanceOfIncidentsApproveRequest(value: object): value is IncidentsApproveRequest {
-    if (!('userId' in value) || value['userId'] === undefined) return false;
+    if (!('approvedBy' in value) || value['approvedBy'] === undefined) return false;
     return true;
 }
 
@@ -45,7 +45,7 @@ export function IncidentsApproveRequestFromJSONTyped(json: any, ignoreDiscrimina
     }
     return {
         
-        'userId': json['user_id'],
+        'approvedBy': json['approved_by'],
     };
 }
 
@@ -60,7 +60,7 @@ export function IncidentsApproveRequestToJSONTyped(value?: IncidentsApproveReque
 
     return {
         
-        'user_id': value['userId'],
+        'approved_by': value['approvedBy'],
     };
 }
 

package/src/models/IncidentsExportCsvBulkRequest.ts

@@ -43,12 +43,6 @@ export interface IncidentsExportCsvBulkRequest {
      * @memberof IncidentsExportCsvBulkRequest
      */
     userId?: Array<string>;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof IncidentsExportCsvBulkRequest
-     */
-    approvedByUserId?: Array<string>;
     /**
      * 
      * @type {Array<string>}
@@ -111,7 +105,6 @@ export function IncidentsExportCsvBulkRequestFromJSONTyped(json: any, ignoreDisc
         'rosterId': json['roster_id'] == null ? undefined : json['roster_id'],
         'registerId': json['register_id'] == null ? undefined : json['register_id'],
         'userId': json['user_id'] == null ? undefined : json['user_id'],
-        'approvedByUserId': json['approved_by_user_id'] == null ? undefined : json['approved_by_user_id'],
         'hasApprovedAt': json['has_approved_at'] == null ? undefined : json['has_approved_at'],
         'submittedByGuard': json['submitted_by_guard'] == null ? undefined : json['submitted_by_guard'],
         'venueId': json['venue_id'],
@@ -136,7 +129,6 @@ export function IncidentsExportCsvBulkRequestToJSONTyped(value?: IncidentsExport
         'roster_id': value['rosterId'],
         'register_id': value['registerId'],
         'user_id': value['userId'],
-        'approved_by_user_id': value['approvedByUserId'],
         'has_approved_at': value['hasApprovedAt'],
         'submitted_by_guard': value['submittedByGuard'],
         'venue_id': value['venueId'],

package/src/models/IncidentsExportPdfBulkRequest.ts

@@ -43,12 +43,6 @@ export interface IncidentsExportPdfBulkRequest {
      * @memberof IncidentsExportPdfBulkRequest
      */
     userId?: Array<string>;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof IncidentsExportPdfBulkRequest
-     */
-    approvedByUserId?: Array<string>;
     /**
      * 
      * @type {Array<string>}
@@ -111,7 +105,6 @@ export function IncidentsExportPdfBulkRequestFromJSONTyped(json: any, ignoreDisc
         'rosterId': json['roster_id'] == null ? undefined : json['roster_id'],
         'registerId': json['register_id'] == null ? undefined : json['register_id'],
         'userId': json['user_id'] == null ? undefined : json['user_id'],
-        'approvedByUserId': json['approved_by_user_id'] == null ? undefined : json['approved_by_user_id'],
         'hasApprovedAt': json['has_approved_at'] == null ? undefined : json['has_approved_at'],
         'submittedByGuard': json['submitted_by_guard'] == null ? undefined : json['submitted_by_guard'],
         'venueId': json['venue_id'],
@@ -136,7 +129,6 @@ export function IncidentsExportPdfBulkRequestToJSONTyped(value?: IncidentsExport
         'roster_id': value['rosterId'],
         'register_id': value['registerId'],
         'user_id': value['userId'],
-        'approved_by_user_id': value['approvedByUserId'],
         'has_approved_at': value['hasApprovedAt'],
         'submitted_by_guard': value['submittedByGuard'],
         'venue_id': value['venueId'],

package/src/models/IncidentsListRequest.ts

@@ -79,12 +79,6 @@ export interface IncidentsListRequest {
      * @memberof IncidentsListRequest
      */
     userId?: Array<string>;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof IncidentsListRequest
-     */
-    approvedByUserId?: Array<string>;
     /**
      * 
      * @type {Array<string>}
@@ -189,7 +183,6 @@ export function IncidentsListRequestFromJSONTyped(json: any, ignoreDiscriminator
         'rosterId': json['roster_id'] == null ? undefined : json['roster_id'],
         'registerId': json['register_id'] == null ? undefined : json['register_id'],
         'userId': json['user_id'] == null ? undefined : json['user_id'],
-        'approvedByUserId': json['approved_by_user_id'] == null ? undefined : json['approved_by_user_id'],
         'hasApprovedAt': json['has_approved_at'] == null ? undefined : json['has_approved_at'],
         'submittedByGuard': json['submitted_by_guard'] == null ? undefined : json['submitted_by_guard'],
         'beforeApprovedAt': json['before_approved_at'] == null ? undefined : (new Date(json['before_approved_at'])),
@@ -223,7 +216,6 @@ export function IncidentsListRequestToJSONTyped(value?: IncidentsListRequest | n
         'roster_id': value['rosterId'],
         'register_id': value['registerId'],
         'user_id': value['userId'],
-        'approved_by_user_id': value['approvedByUserId'],
         'has_approved_at': value['hasApprovedAt'],
         'submitted_by_guard': value['submittedByGuard'],
         'before_approved_at': value['beforeApprovedAt'] == null ? undefined : ((value['beforeApprovedAt']).toISOString()),

package/src/models/RegisterListResource.ts

@@ -63,13 +63,13 @@ export interface RegisterListResource {
      * @type {Date}
      * @memberof RegisterListResource
      */
-    finishDateTime: Date;
+    finishDateTime?: Date | null;
     /**
      * 
-     * @type {string}
+     * @type {object}
      * @memberof RegisterListResource
      */
-    shiftLength: string;
+    shiftLength: object;
     /**
      * 
      * @type {number}
@@ -165,7 +165,7 @@ export interface RegisterListResource {
      * @type {number}
      * @memberof RegisterListResource
      */
-    signOffLat: number;
+    signOffLat?: number | null;
     /**
      * 
      * @type {number}
@@ -199,7 +199,6 @@ export function instanceOfRegisterListResource(value: object): value is Register
     if (!('user' in value) || value['user'] === undefined) return false;
     if (!('venue' in value) || value['venue'] === undefined) return false;
     if (!('startDateTime' in value) || value['startDateTime'] === undefined) return false;
-    if (!('finishDateTime' in value) || value['finishDateTime'] === undefined) return false;
     if (!('shiftLength' in value) || value['shiftLength'] === undefined) return false;
     if (!('signOffStatus' in value) || value['signOffStatus'] === undefined) return false;
     if (!('rampReadAt' in value) || value['rampReadAt'] === undefined) return false;
@@ -215,7 +214,6 @@ export function instanceOfRegisterListResource(value: object): value is Register
     if (!('firstAid' in value) || value['firstAid'] === undefined) return false;
     if (!('signOnLat' in value) || value['signOnLat'] === undefined) return false;
     if (!('signOnLong' in value) || value['signOnLong'] === undefined) return false;
-    if (!('signOffLat' in value) || value['signOffLat'] === undefined) return false;
     if (!('signOffLong' in value) || value['signOffLong'] === undefined) return false;
     if (!('hasIncidents' in value) || value['hasIncidents'] === undefined) return false;
     return true;
@@ -235,7 +233,7 @@ export function RegisterListResourceFromJSONTyped(json: any, ignoreDiscriminator
         'user': UserLiteResourceFromJSON(json['user']),
         'venue': VenueLiteResourceFromJSON(json['venue']),
         'startDateTime': (new Date(json['startDateTime'])),
-        'finishDateTime': (new Date(json['finishDateTime'])),
+        'finishDateTime': json['finishDateTime'] == null ? undefined : (new Date(json['finishDateTime'])),
         'shiftLength': json['shiftLength'],
         'signOffStatus': json['signOffStatus'],
         'badgeNumber': json['badgeNumber'] == null ? undefined : json['badgeNumber'],
@@ -252,7 +250,7 @@ export function RegisterListResourceFromJSONTyped(json: any, ignoreDiscriminator
         'firstAid': json['firstAid'],
         'signOnLat': json['signOnLat'],
         'signOnLong': json['signOnLong'],
-        'signOffLat': json['signOffLat'],
+        'signOffLat': json['signOffLat'] == null ? undefined : json['signOffLat'],
         'signOffLong': json['signOffLong'],
         'hasIncidents': json['hasIncidents'],
     };
@@ -273,7 +271,7 @@ export function RegisterListResourceToJSONTyped(value?: RegisterListResource | n
         'user': UserLiteResourceToJSON(value['user']),
         'venue': VenueLiteResourceToJSON(value['venue']),
         'startDateTime': ((value['startDateTime']).toISOString()),
-        'finishDateTime': ((value['finishDateTime']).toISOString()),
+        'finishDateTime': value['finishDateTime'] === null ? null : ((value['finishDateTime'] as any)?.toISOString()),
         'shiftLength': value['shiftLength'],
         'signOffStatus': value['signOffStatus'],
         'badgeNumber': value['badgeNumber'],

package/src/models/RosterLiteResource.ts

@@ -36,7 +36,7 @@ export interface RosterLiteResource {
      * @type {Date}
      * @memberof RosterLiteResource
      */
-    finishDateTime: Date;
+    finishDateTime?: Date | null;
 }
 
 /**
@@ -44,7 +44,6 @@ export interface RosterLiteResource {
  */
 export function instanceOfRosterLiteResource(value: object): value is RosterLiteResource {
     if (!('startDateTime' in value) || value['startDateTime'] === undefined) return false;
-    if (!('finishDateTime' in value) || value['finishDateTime'] === undefined) return false;
     return true;
 }
 
@@ -60,7 +59,7 @@ export function RosterLiteResourceFromJSONTyped(json: any, ignoreDiscriminator:
         
         'id': json['id'] == null ? undefined : json['id'],
         'startDateTime': (new Date(json['startDateTime'])),
-        'finishDateTime': (new Date(json['finishDateTime'])),
+        'finishDateTime': json['finishDateTime'] == null ? undefined : (new Date(json['finishDateTime'])),
     };
 }
 
@@ -77,7 +76,7 @@ export function RosterLiteResourceToJSONTyped(value?: RosterLiteResource | null,
         
         'id': value['id'],
         'startDateTime': ((value['startDateTime']).toISOString()),
-        'finishDateTime': ((value['finishDateTime']).toISOString()),
+        'finishDateTime': value['finishDateTime'] === null ? null : ((value['finishDateTime'] as any)?.toISOString()),
     };
 }
 

package/src/models/RosterWithRegistersResource.ts

@@ -76,7 +76,7 @@ export interface RosterWithRegistersResource {
      * @type {Date}
      * @memberof RosterWithRegistersResource
      */
-    finishDateTime: Date;
+    finishDateTime?: Date | null;
     /**
      * 
      * @type {boolean}
@@ -123,7 +123,6 @@ export function instanceOfRosterWithRegistersResource(value: object): value is R
     if (!('state' in value) || value['state'] === undefined) return false;
     if (!('securityCompany' in value) || value['securityCompany'] === undefined) return false;
     if (!('startDateTime' in value) || value['startDateTime'] === undefined) return false;
-    if (!('finishDateTime' in value) || value['finishDateTime'] === undefined) return false;
     if (!('isCompliant' in value) || value['isCompliant'] === undefined) return false;
     if (!('isComplete' in value) || value['isComplete'] === undefined) return false;
     if (!('signOffStatus' in value) || value['signOffStatus'] === undefined) return false;
@@ -146,7 +145,7 @@ export function RosterWithRegistersResourceFromJSONTyped(json: any, ignoreDiscri
         'state': json['state'],
         'securityCompany': SecurityCompanyLiteResourceFromJSON(json['securityCompany']),
         'startDateTime': (new Date(json['startDateTime'])),
-        'finishDateTime': (new Date(json['finishDateTime'])),
+        'finishDateTime': json['finishDateTime'] == null ? undefined : (new Date(json['finishDateTime'])),
         'isCompliant': json['isCompliant'],
         'isComplete': json['isComplete'],
         'signOffStatus': json['signOffStatus'],
@@ -170,7 +169,7 @@ export function RosterWithRegistersResourceToJSONTyped(value?: RosterWithRegiste
         'state': value['state'],
         'securityCompany': SecurityCompanyLiteResourceToJSON(value['securityCompany']),
         'startDateTime': ((value['startDateTime']).toISOString()),
-        'finishDateTime': ((value['finishDateTime']).toISOString()),
+        'finishDateTime': value['finishDateTime'] === null ? null : ((value['finishDateTime'] as any)?.toISOString()),
         'isCompliant': value['isCompliant'],
         'isComplete': value['isComplete'],
         'signOffStatus': value['signOffStatus'],