roles

src/controllers/CompanyController.ts

@@ -1,6 +1,6 @@
 import { Company } from "../../generated/prisma/client";
 import { fetchCwCompanyById } from "../modules/cw-utils/fetchCompany";
-import { fetchCompanyConfigurations } from "../modules/cw-utils/fetchCompanyConfigurations";
+import { fetchCompanyConfigurations } from "../modules/cw-utils/configurations/fetchCompanyConfigurations";
 import { updateCwInternalCompany } from "../modules/cw-utils/updateCompany";
 import { Company as CWCompany } from "../types/ConnectWiseTypes";
 
@@ -16,12 +16,14 @@ export class CompanyController {
   public name: string;
   public readonly cw_Identifier: string;
   public readonly cw_CompanyId: number;
+  public readonly cw_Data?: CWCompany;
 
-  constructor(companyData: Company) {
+  constructor(companyData: Company, cwData?: CWCompany) {
     this.id = companyData.id;
     this.name = companyData.name;
     this.cw_Identifier = companyData.cw_Identifier;
     this.cw_CompanyId = companyData.cw_CompanyId;
+    this.cw_Data = cwData;
   }
 
   /**
@@ -65,12 +67,22 @@ export class CompanyController {
     return data;
   }
 
-  public toJson() {
+  public toJson(opts?: { includeAddress: boolean }) {
     return {
       id: this.id,
       name: this.name,
       cw_Identifier: this.cw_Identifier,
       cw_CompanyId: this.cw_CompanyId,
+      cw_Data: {
+        address: {
+          line1: this.cw_Data?.addressLine1,
+          line2: this.cw_Data?.addressLine2 ?? null,
+          city: this.cw_Data?.city,
+          state: this.cw_Data?.state,
+          zip: this.cw_Data?.zip,
+          country: this.cw_Data?.country.name,
+        },
+      },
     };
   }
 }

src/controllers/RoleController.ts

@@ -265,7 +265,7 @@ export class RoleController {
         where: { moniker: data.moniker },
       });
 
-      if (checkMoniker)
+      if (checkMoniker && checkMoniker.moniker !== this.moniker)
         throw new RoleError(
           "Moniker is already taken.",
           "Another role with this moniker already exists in the databse.",