@managespace/sdk 0.1.150 → 0.1.151

package/src/generated/models/pricing-rule-legend.ts

@@ -13,6 +13,13 @@
  */
 
 import { mapValues } from '../runtime';
+import type { User } from './user';
+import {
+    UserFromJSON,
+    UserFromJSONTyped,
+    UserToJSON,
+    UserToJSONTyped,
+} from './user';
 import type { Org } from './org';
 import {
     OrgFromJSON,
@@ -27,13 +34,6 @@ import {
     PricingRuleToJSON,
     PricingRuleToJSONTyped,
 } from './pricing-rule';
-import type { User1 } from './user1';
-import {
-    User1FromJSON,
-    User1FromJSONTyped,
-    User1ToJSON,
-    User1ToJSONTyped,
-} from './user1';
 
 /**
  * 
@@ -133,10 +133,10 @@ export interface PricingRuleLegend {
     lessThanStandardPercentColour: string | null;
     /**
      * Who created the note
-     * @type {User1}
+     * @type {User}
      * @memberof PricingRuleLegend
      */
-    createdBy?: User1;
+    createdBy?: User;
     /**
      * 
      * @type {string}
@@ -151,10 +151,10 @@ export interface PricingRuleLegend {
     createdAt: Date | null;
     /**
      * Who updated the note
-     * @type {User1}
+     * @type {User}
      * @memberof PricingRuleLegend
      */
-    updatedBy?: User1 | null;
+    updatedBy?: User | null;
     /**
      * 
      * @type {string}
@@ -232,10 +232,10 @@ export function PricingRuleLegendFromJSONTyped(json: any, ignoreDiscriminator: b
         'moreThanStandardPercentColour': json['moreThanStandardPercentColour'],
         'lessThanStandardPercent': json['lessThanStandardPercent'],
         'lessThanStandardPercentColour': json['lessThanStandardPercentColour'],
-        'createdBy': json['createdBy'] == null ? undefined : User1FromJSON(json['createdBy']),
+        'createdBy': json['createdBy'] == null ? undefined : UserFromJSON(json['createdBy']),
         'createdById': json['createdById'],
         'createdAt': (json['createdAt'] == null ? null : new Date(json['createdAt'])),
-        'updatedBy': json['updatedBy'] == null ? undefined : User1FromJSON(json['updatedBy']),
+        'updatedBy': json['updatedBy'] == null ? undefined : UserFromJSON(json['updatedBy']),
         'updatedById': json['updatedById'],
         'updatedAt': (json['updatedAt'] == null ? null : new Date(json['updatedAt'])),
         'pricingRule': json['pricingRule'] == null ? undefined : PricingRuleFromJSON(json['pricingRule']),
@@ -269,10 +269,10 @@ export function PricingRuleLegendToJSONTyped(value?: PricingRuleLegend | null, i
         'moreThanStandardPercentColour': value['moreThanStandardPercentColour'],
         'lessThanStandardPercent': value['lessThanStandardPercent'],
         'lessThanStandardPercentColour': value['lessThanStandardPercentColour'],
-        'createdBy': User1ToJSON(value['createdBy']),
+        'createdBy': UserToJSON(value['createdBy']),
         'createdById': value['createdById'],
         'createdAt': (value['createdAt'] == null ? null : (value['createdAt'] as any).toISOString()),
-        'updatedBy': User1ToJSON(value['updatedBy']),
+        'updatedBy': UserToJSON(value['updatedBy']),
         'updatedById': value['updatedById'],
         'updatedAt': (value['updatedAt'] == null ? null : (value['updatedAt'] as any).toISOString()),
         'pricingRule': PricingRuleToJSON(value['pricingRule']),

package/src/generated/models/pricing-rule.ts

@@ -20,6 +20,13 @@ import {
     SiteToJSON,
     SiteToJSONTyped,
 } from './site';
+import type { User } from './user';
+import {
+    UserFromJSON,
+    UserFromJSONTyped,
+    UserToJSON,
+    UserToJSONTyped,
+} from './user';
 import type { Org } from './org';
 import {
     OrgFromJSON,
@@ -27,13 +34,6 @@ import {
     OrgToJSON,
     OrgToJSONTyped,
 } from './org';
-import type { User1 } from './user1';
-import {
-    User1FromJSON,
-    User1FromJSONTyped,
-    User1ToJSON,
-    User1ToJSONTyped,
-} from './user1';
 import type { PricingRuleCriteria } from './pricing-rule-criteria';
 import {
     PricingRuleCriteriaFromJSON,
@@ -148,10 +148,10 @@ export interface PricingRule {
     noticeDays: number;
     /**
      * Who created the note
-     * @type {User1}
+     * @type {User}
      * @memberof PricingRule
      */
-    createdBy?: User1;
+    createdBy?: User;
     /**
      * 
      * @type {string}
@@ -166,10 +166,10 @@ export interface PricingRule {
     createdAt: Date | null;
     /**
      * Who updated the note
-     * @type {User1}
+     * @type {User}
      * @memberof PricingRule
      */
-    updatedBy?: User1 | null;
+    updatedBy?: User | null;
     /**
      * 
      * @type {string}
@@ -242,10 +242,10 @@ export function PricingRuleFromJSONTyped(json: any, ignoreDiscriminator: boolean
         'roundToNearest': json['roundToNearest'],
         'capAtStandardRate': json['capAtStandardRate'],
         'noticeDays': json['noticeDays'],
-        'createdBy': json['createdBy'] == null ? undefined : User1FromJSON(json['createdBy']),
+        'createdBy': json['createdBy'] == null ? undefined : UserFromJSON(json['createdBy']),
         'createdById': json['createdById'],
         'createdAt': (json['createdAt'] == null ? null : new Date(json['createdAt'])),
-        'updatedBy': json['updatedBy'] == null ? undefined : User1FromJSON(json['updatedBy']),
+        'updatedBy': json['updatedBy'] == null ? undefined : UserFromJSON(json['updatedBy']),
         'updatedById': json['updatedById'],
         'updatedAt': (json['updatedAt'] == null ? null : new Date(json['updatedAt'])),
         'criteria': json['criteria'] == null ? undefined : PricingRuleCriteriaFromJSON(json['criteria']),
@@ -278,10 +278,10 @@ export function PricingRuleToJSONTyped(value?: PricingRule | null, ignoreDiscrim
         'roundToNearest': value['roundToNearest'],
         'capAtStandardRate': value['capAtStandardRate'],
         'noticeDays': value['noticeDays'],
-        'createdBy': User1ToJSON(value['createdBy']),
+        'createdBy': UserToJSON(value['createdBy']),
         'createdById': value['createdById'],
         'createdAt': (value['createdAt'] == null ? null : (value['createdAt'] as any).toISOString()),
-        'updatedBy': User1ToJSON(value['updatedBy']),
+        'updatedBy': UserToJSON(value['updatedBy']),
         'updatedById': value['updatedById'],
         'updatedAt': (value['updatedAt'] == null ? null : (value['updatedAt'] as any).toISOString()),
         'criteria': PricingRuleCriteriaToJSON(value['criteria']),

package/src/generated/models/project-version.ts

@@ -13,13 +13,6 @@
  */
 
 import { mapValues } from '../runtime';
-import type { Project } from './project';
-import {
-    ProjectFromJSON,
-    ProjectFromJSONTyped,
-    ProjectToJSON,
-    ProjectToJSONTyped,
-} from './project';
 import type { Org } from './org';
 import {
     OrgFromJSON,
@@ -34,6 +27,13 @@ import {
     ExtensibilityFunctionMetadataToJSON,
     ExtensibilityFunctionMetadataToJSONTyped,
 } from './extensibility-function-metadata';
+import type { Project1 } from './project1';
+import {
+    Project1FromJSON,
+    Project1FromJSONTyped,
+    Project1ToJSON,
+    Project1ToJSONTyped,
+} from './project1';
 import type { WorkflowStepMetadata } from './workflow-step-metadata';
 import {
     WorkflowStepMetadataFromJSON,
@@ -104,10 +104,10 @@ export interface ProjectVersion {
     createdAt: Date;
     /**
      * 
-     * @type {Project}
+     * @type {Project1}
      * @memberof ProjectVersion
      */
-    project?: Project;
+    project?: Project1;
     /**
      * 
      * @type {string}
@@ -163,7 +163,7 @@ export function ProjectVersionFromJSONTyped(json: any, ignoreDiscriminator: bool
         'org': json['org'] == null ? undefined : OrgFromJSON(json['org']),
         'orgId': json['orgId'],
         'createdAt': (new Date(json['createdAt'])),
-        'project': json['project'] == null ? undefined : ProjectFromJSON(json['project']),
+        'project': json['project'] == null ? undefined : Project1FromJSON(json['project']),
         'projectId': json['projectId'],
         'extensibilityFunctionMetadata': json['extensibilityFunctionMetadata'] == null ? undefined : ((json['extensibilityFunctionMetadata'] as Array<any>).map(ExtensibilityFunctionMetadataFromJSON)),
         'workflowStepMetadata': json['workflowStepMetadata'] == null ? undefined : ((json['workflowStepMetadata'] as Array<any>).map(WorkflowStepMetadataFromJSON)),
@@ -190,7 +190,7 @@ export function ProjectVersionToJSONTyped(value?: ProjectVersion | null, ignoreD
         'org': OrgToJSON(value['org']),
         'orgId': value['orgId'],
         'createdAt': ((value['createdAt']).toISOString()),
-        'project': ProjectToJSON(value['project']),
+        'project': Project1ToJSON(value['project']),
         'projectId': value['projectId'],
         'extensibilityFunctionMetadata': value['extensibilityFunctionMetadata'] == null ? undefined : ((value['extensibilityFunctionMetadata'] as Array<any>).map(ExtensibilityFunctionMetadataToJSON)),
         'workflowStepMetadata': value['workflowStepMetadata'] == null ? undefined : ((value['workflowStepMetadata'] as Array<any>).map(WorkflowStepMetadataToJSON)),

package/src/generated/models/rate-change.ts

@@ -27,6 +27,13 @@ import {
     RateChangeStatusToJSON,
     RateChangeStatusToJSONTyped,
 } from './rate-change-status';
+import type { User } from './user';
+import {
+    UserFromJSON,
+    UserFromJSONTyped,
+    UserToJSON,
+    UserToJSONTyped,
+} from './user';
 import type { Customer } from './customer';
 import {
     CustomerFromJSON,
@@ -48,13 +55,6 @@ import {
     PricingRuleToJSON,
     PricingRuleToJSONTyped,
 } from './pricing-rule';
-import type { User1 } from './user1';
-import {
-    User1FromJSON,
-    User1FromJSONTyped,
-    User1ToJSON,
-    User1ToJSONTyped,
-} from './user1';
 import type { Asset } from './asset';
 import {
     AssetFromJSON,
@@ -215,10 +215,10 @@ export interface RateChange {
     productPrice: string;
     /**
      * Who created the note
-     * @type {User1}
+     * @type {User}
      * @memberof RateChange
      */
-    createdBy?: User1;
+    createdBy?: User;
     /**
      * 
      * @type {string}
@@ -233,10 +233,10 @@ export interface RateChange {
     createdAt: Date | null;
     /**
      * Who updated the note
-     * @type {User1}
+     * @type {User}
      * @memberof RateChange
      */
-    updatedBy?: User1 | null;
+    updatedBy?: User | null;
     /**
      * 
      * @type {string}
@@ -317,10 +317,10 @@ export function RateChangeFromJSONTyped(json: any, ignoreDiscriminator: boolean)
         'productId': json['productId'],
         'productName': json['productName'],
         'productPrice': json['productPrice'],
-        'createdBy': json['createdBy'] == null ? undefined : User1FromJSON(json['createdBy']),
+        'createdBy': json['createdBy'] == null ? undefined : UserFromJSON(json['createdBy']),
         'createdById': json['createdById'],
         'createdAt': (json['createdAt'] == null ? null : new Date(json['createdAt'])),
-        'updatedBy': json['updatedBy'] == null ? undefined : User1FromJSON(json['updatedBy']),
+        'updatedBy': json['updatedBy'] == null ? undefined : UserFromJSON(json['updatedBy']),
         'updatedById': json['updatedById'],
         'updatedAt': (json['updatedAt'] == null ? null : new Date(json['updatedAt'])),
     };
@@ -361,10 +361,10 @@ export function RateChangeToJSONTyped(value?: RateChange | null, ignoreDiscrimin
         'productId': value['productId'],
         'productName': value['productName'],
         'productPrice': value['productPrice'],
-        'createdBy': User1ToJSON(value['createdBy']),
+        'createdBy': UserToJSON(value['createdBy']),
         'createdById': value['createdById'],
         'createdAt': (value['createdAt'] == null ? null : (value['createdAt'] as any).toISOString()),
-        'updatedBy': User1ToJSON(value['updatedBy']),
+        'updatedBy': UserToJSON(value['updatedBy']),
         'updatedById': value['updatedById'],
         'updatedAt': (value['updatedAt'] == null ? null : (value['updatedAt'] as any).toISOString()),
     };

package/src/generated/models/role.ts

@@ -20,13 +20,13 @@ import {
     UserToJSON,
     UserToJSONTyped,
 } from './user';
-import type { Roles2 } from './roles2';
+import type { Roles1 } from './roles1';
 import {
-    Roles2FromJSON,
-    Roles2FromJSONTyped,
-    Roles2ToJSON,
-    Roles2ToJSONTyped,
-} from './roles2';
+    Roles1FromJSON,
+    Roles1FromJSONTyped,
+    Roles1ToJSON,
+    Roles1ToJSONTyped,
+} from './roles1';
 
 /**
  * 
@@ -42,10 +42,10 @@ export interface Role {
     id: number;
     /**
      * 
-     * @type {Roles2}
+     * @type {Roles1}
      * @memberof Role
      */
-    codeName: Roles2;
+    codeName: Roles1;
     /**
      * Role display name
      * @type {string}
@@ -90,7 +90,7 @@ export function RoleFromJSONTyped(json: any, ignoreDiscriminator: boolean): Role
     return {
         
         'id': json['id'],
-        'codeName': Roles2FromJSON(json['codeName']),
+        'codeName': Roles1FromJSON(json['codeName']),
         'displayName': json['displayName'],
         'description': json['description'],
         'users': json['users'] == null ? undefined : ((json['users'] as Array<any>).map(UserFromJSON)),
@@ -109,7 +109,7 @@ export function RoleToJSONTyped(value?: Role | null, ignoreDiscriminator: boolea
     return {
         
         'id': value['id'],
-        'codeName': Roles2ToJSON(value['codeName']),
+        'codeName': Roles1ToJSON(value['codeName']),
         'displayName': value['displayName'],
         'description': value['description'],
         'users': value['users'] == null ? undefined : ((value['users'] as Array<any>).map(UserToJSON)),

package/src/generated/models/role1.ts

@@ -20,13 +20,13 @@ import {
     UserToJSON,
     UserToJSONTyped,
 } from './user';
-import type { Roles3 } from './roles3';
+import type { Roles2 } from './roles2';
 import {
-    Roles3FromJSON,
-    Roles3FromJSONTyped,
-    Roles3ToJSON,
-    Roles3ToJSONTyped,
-} from './roles3';
+    Roles2FromJSON,
+    Roles2FromJSONTyped,
+    Roles2ToJSON,
+    Roles2ToJSONTyped,
+} from './roles2';
 
 /**
  * 
@@ -42,10 +42,10 @@ export interface Role1 {
     id: number;
     /**
      * 
-     * @type {Roles3}
+     * @type {Roles2}
      * @memberof Role1
      */
-    codeName: Roles3;
+    codeName: Roles2;
     /**
      * Role display name
      * @type {string}
@@ -90,7 +90,7 @@ export function Role1FromJSONTyped(json: any, ignoreDiscriminator: boolean): Rol
     return {
         
         'id': json['id'],
-        'codeName': Roles3FromJSON(json['codeName']),
+        'codeName': Roles2FromJSON(json['codeName']),
         'displayName': json['displayName'],
         'description': json['description'],
         'users': json['users'] == null ? undefined : ((json['users'] as Array<any>).map(UserFromJSON)),
@@ -109,7 +109,7 @@ export function Role1ToJSONTyped(value?: Role1 | null, ignoreDiscriminator: bool
     return {
         
         'id': value['id'],
-        'codeName': Roles3ToJSON(value['codeName']),
+        'codeName': Roles2ToJSON(value['codeName']),
         'displayName': value['displayName'],
         'description': value['description'],
         'users': value['users'] == null ? undefined : ((value['users'] as Array<any>).map(UserToJSON)),

package/src/generated/models/role2.ts

@@ -13,20 +13,20 @@
  */
 
 import { mapValues } from '../runtime';
-import type { User1 } from './user1';
+import type { User } from './user';
 import {
-    User1FromJSON,
-    User1FromJSONTyped,
-    User1ToJSON,
-    User1ToJSONTyped,
-} from './user1';
-import type { Roles4 } from './roles4';
+    UserFromJSON,
+    UserFromJSONTyped,
+    UserToJSON,
+    UserToJSONTyped,
+} from './user';
+import type { Roles3 } from './roles3';
 import {
-    Roles4FromJSON,
-    Roles4FromJSONTyped,
-    Roles4ToJSON,
-    Roles4ToJSONTyped,
-} from './roles4';
+    Roles3FromJSON,
+    Roles3FromJSONTyped,
+    Roles3ToJSON,
+    Roles3ToJSONTyped,
+} from './roles3';
 
 /**
  * 
@@ -42,10 +42,10 @@ export interface Role2 {
     id: number;
     /**
      * 
-     * @type {Roles4}
+     * @type {Roles3}
      * @memberof Role2
      */
-    codeName: Roles4;
+    codeName: Roles3;
     /**
      * Role display name
      * @type {string}
@@ -60,10 +60,10 @@ export interface Role2 {
     description: string | null;
     /**
      * 
-     * @type {Array<User1>}
+     * @type {Array<User>}
      * @memberof Role2
      */
-    users?: Array<User1>;
+    users?: Array<User>;
 }
 
 
@@ -90,10 +90,10 @@ export function Role2FromJSONTyped(json: any, ignoreDiscriminator: boolean): Rol
     return {
         
         'id': json['id'],
-        'codeName': Roles4FromJSON(json['codeName']),
+        'codeName': Roles3FromJSON(json['codeName']),
         'displayName': json['displayName'],
         'description': json['description'],
-        'users': json['users'] == null ? undefined : ((json['users'] as Array<any>).map(User1FromJSON)),
+        'users': json['users'] == null ? undefined : ((json['users'] as Array<any>).map(UserFromJSON)),
     };
 }
 
@@ -109,10 +109,10 @@ export function Role2ToJSONTyped(value?: Role2 | null, ignoreDiscriminator: bool
     return {
         
         'id': value['id'],
-        'codeName': Roles4ToJSON(value['codeName']),
+        'codeName': Roles3ToJSON(value['codeName']),
         'displayName': value['displayName'],
         'description': value['description'],
-        'users': value['users'] == null ? undefined : ((value['users'] as Array<any>).map(User1ToJSON)),
+        'users': value['users'] == null ? undefined : ((value['users'] as Array<any>).map(UserToJSON)),
     };
 }
 

package/src/generated/models/site.ts

@@ -20,6 +20,20 @@ import {
     TaskInstanceToJSON,
     TaskInstanceToJSONTyped,
 } from './task-instance';
+import type { SiteType4 } from './site-type4';
+import {
+    SiteType4FromJSON,
+    SiteType4FromJSONTyped,
+    SiteType4ToJSON,
+    SiteType4ToJSONTyped,
+} from './site-type4';
+import type { User } from './user';
+import {
+    UserFromJSON,
+    UserFromJSONTyped,
+    UserToJSON,
+    UserToJSONTyped,
+} from './user';
 import type { Address } from './address';
 import {
     AddressFromJSON,
@@ -48,20 +62,6 @@ import {
     PricingRuleToJSON,
     PricingRuleToJSONTyped,
 } from './pricing-rule';
-import type { SiteRole } from './site-role';
-import {
-    SiteRoleFromJSON,
-    SiteRoleFromJSONTyped,
-    SiteRoleToJSON,
-    SiteRoleToJSONTyped,
-} from './site-role';
-import type { User1 } from './user1';
-import {
-    User1FromJSON,
-    User1FromJSONTyped,
-    User1ToJSON,
-    User1ToJSONTyped,
-} from './user1';
 import type { Calendar } from './calendar';
 import {
     CalendarFromJSON,
@@ -118,13 +118,6 @@ import {
     ChecklistToJSON,
     ChecklistToJSONTyped,
 } from './checklist';
-import type { SiteType } from './site-type';
-import {
-    SiteTypeFromJSON,
-    SiteTypeFromJSONTyped,
-    SiteTypeToJSON,
-    SiteTypeToJSONTyped,
-} from './site-type';
 import type { Asset } from './asset';
 import {
     AssetFromJSON,
@@ -180,10 +173,10 @@ export interface Site {
     accessCodeLength: number;
     /**
      * 
-     * @type {Array<SiteType>}
+     * @type {Array<SiteType4>}
      * @memberof Site
      */
-    types?: Array<SiteType>;
+    types?: Array<SiteType4>;
     /**
      * 
      * @type {Org}
@@ -198,10 +191,10 @@ export interface Site {
     orgId: string;
     /**
      * 
-     * @type {Array<User1>}
+     * @type {Array<User>}
      * @memberof Site
      */
-    users?: Array<User1>;
+    users?: Array<User>;
     /**
      * Site email address
      * @type {string}
@@ -306,10 +299,10 @@ export interface Site {
     documents?: Array<UploadedDocument>;
     /**
      * 
-     * @type {Array<User1>}
+     * @type {Array<User>}
      * @memberof Site
      */
-    activeUsers?: Array<User1>;
+    activeUsers?: Array<User>;
     /**
      * 
      * @type {Array<TaskDefinition>}
@@ -334,12 +327,6 @@ export interface Site {
      * @memberof Site
      */
     assetReservations?: Array<AssetReservation>;
-    /**
-     * 
-     * @type {Array<SiteRole>}
-     * @memberof Site
-     */
-    siteRoles?: Array<SiteRole>;
 }
 
 /**
@@ -371,10 +358,10 @@ export function SiteFromJSONTyped(json: any, ignoreDiscriminator: boolean): Site
         'id': json['id'],
         'name': json['name'],
         'accessCodeLength': json['accessCodeLength'],
-        'types': json['types'] == null ? undefined : ((json['types'] as Array<any>).map(SiteTypeFromJSON)),
+        'types': json['types'] == null ? undefined : ((json['types'] as Array<any>).map(SiteType4FromJSON)),
         'org': json['org'] == null ? undefined : OrgFromJSON(json['org']),
         'orgId': json['orgId'],
-        'users': json['users'] == null ? undefined : ((json['users'] as Array<any>).map(User1FromJSON)),
+        'users': json['users'] == null ? undefined : ((json['users'] as Array<any>).map(UserFromJSON)),
         'email': json['email'],
         'phoneNumber': json['phoneNumber'],
         'createdAt': (new Date(json['createdAt'])),
@@ -392,12 +379,11 @@ export function SiteFromJSONTyped(json: any, ignoreDiscriminator: boolean): Site
         'address': json['address'] == null ? undefined : AddressFromJSON(json['address']),
         'addressId': json['addressId'],
         'documents': json['documents'] == null ? undefined : ((json['documents'] as Array<any>).map(UploadedDocumentFromJSON)),
-        'activeUsers': json['activeUsers'] == null ? undefined : ((json['activeUsers'] as Array<any>).map(User1FromJSON)),
+        'activeUsers': json['activeUsers'] == null ? undefined : ((json['activeUsers'] as Array<any>).map(UserFromJSON)),
         'taskDefinitions': json['taskDefinitions'] == null ? undefined : ((json['taskDefinitions'] as Array<any>).map(TaskDefinitionFromJSON)),
         'pricingRules': json['pricingRules'] == null ? undefined : ((json['pricingRules'] as Array<any>).map(PricingRuleFromJSON)),
         'rateChanges': json['rateChanges'] == null ? undefined : ((json['rateChanges'] as Array<any>).map(RateChangeFromJSON)),
         'assetReservations': json['assetReservations'] == null ? undefined : ((json['assetReservations'] as Array<any>).map(AssetReservationFromJSON)),
-        'siteRoles': json['siteRoles'] == null ? undefined : ((json['siteRoles'] as Array<any>).map(SiteRoleFromJSON)),
     };
 }
 
@@ -415,10 +401,10 @@ export function SiteToJSONTyped(value?: Site | null, ignoreDiscriminator: boolea
         'id': value['id'],
         'name': value['name'],
         'accessCodeLength': value['accessCodeLength'],
-        'types': value['types'] == null ? undefined : ((value['types'] as Array<any>).map(SiteTypeToJSON)),
+        'types': value['types'] == null ? undefined : ((value['types'] as Array<any>).map(SiteType4ToJSON)),
         'org': OrgToJSON(value['org']),
         'orgId': value['orgId'],
-        'users': value['users'] == null ? undefined : ((value['users'] as Array<any>).map(User1ToJSON)),
+        'users': value['users'] == null ? undefined : ((value['users'] as Array<any>).map(UserToJSON)),
         'email': value['email'],
         'phoneNumber': value['phoneNumber'],
         'createdAt': ((value['createdAt']).toISOString()),
@@ -436,12 +422,11 @@ export function SiteToJSONTyped(value?: Site | null, ignoreDiscriminator: boolea
         'address': AddressToJSON(value['address']),
         'addressId': value['addressId'],
         'documents': value['documents'] == null ? undefined : ((value['documents'] as Array<any>).map(UploadedDocumentToJSON)),
-        'activeUsers': value['activeUsers'] == null ? undefined : ((value['activeUsers'] as Array<any>).map(User1ToJSON)),
+        'activeUsers': value['activeUsers'] == null ? undefined : ((value['activeUsers'] as Array<any>).map(UserToJSON)),
         'taskDefinitions': value['taskDefinitions'] == null ? undefined : ((value['taskDefinitions'] as Array<any>).map(TaskDefinitionToJSON)),
         'pricingRules': value['pricingRules'] == null ? undefined : ((value['pricingRules'] as Array<any>).map(PricingRuleToJSON)),
         'rateChanges': value['rateChanges'] == null ? undefined : ((value['rateChanges'] as Array<any>).map(RateChangeToJSON)),
         'assetReservations': value['assetReservations'] == null ? undefined : ((value['assetReservations'] as Array<any>).map(AssetReservationToJSON)),
-        'siteRoles': value['siteRoles'] == null ? undefined : ((value['siteRoles'] as Array<any>).map(SiteRoleToJSON)),
     };
 }