Lots of updates and cleaning up.

src/controllers/CompanyController.ts

@@ -1,5 +1,8 @@
 import { Company } from "../../generated/prisma/client";
+import { fetchCwCompanyById } from "../modules/cw-utils/fetchCompany";
+import { fetchCompanyConfigurations } from "../modules/cw-utils/fetchCompanyConfigurations";
 import { updateCwInternalCompany } from "../modules/cw-utils/updateCompany";
+import { Company as CWCompany } from "../types/ConnectWiseTypes";
 
 /**
  * Company Controller
@@ -36,6 +39,32 @@ export class CompanyController {
     return this;
   }
 
+  /**
+   * Fetch ConnectWise Company Data
+   *
+   * This method retrieves the latest company data directly from ConnectWise
+   * using the stored ConnectWise Company ID.
+   *
+   * @returns {Company}
+   */
+  public async fetchCwData(): Promise<CWCompany | null> {
+    const data = await fetchCwCompanyById(this.cw_CompanyId);
+    return data;
+  }
+
+  /**
+   * Fetch Company Configurations
+   *
+   * This method retrieves the configurations associated with
+   * the company from ConnectWise.
+   *
+   * @returns {ProcessedConfiguration}
+   */
+  public async fetchConfigurations() {
+    const data = await fetchCompanyConfigurations(this.cw_CompanyId);
+    return data;
+  }
+
   public toJson() {
     return {
       id: this.id,

src/controllers/RoleController.ts

@@ -138,12 +138,11 @@ export class RoleController {
       data: { permissions: newPermissionsToken },
     });
 
-    events.emit("role:permissions:updated", {
+    events.emit("role:permissions:set", {
       current: permissions,
       currentSigned: newPermissionsToken,
       previous: previous.permissions,
       previousSigned: this._permissionsToken,
-      action: "set",
       role: this,
     });
 
@@ -178,12 +177,11 @@ export class RoleController {
       data: { permissions: newPermissionsToken },
     });
 
-    events.emit("role:permissions:updated", {
-      current: permissions,
-      currentSigned: newPermissionsToken,
+    events.emit("role:permissions:added", {
       previous: previous.permissions,
       previousSigned: this._permissionsToken,
-      action: "added",
+      added: permissions,
+      currentSigned: newPermissionsToken,
       role: this,
     });
 
@@ -218,12 +216,11 @@ export class RoleController {
       data: { permissions: newPermissionsToken },
     });
 
-    events.emit("role:permissions:updated", {
-      current: permissions,
-      currentSigned: newPermissionsToken,
+    events.emit("role:permissions:removed", {
       previous: previous.permissions,
       previousSigned: this._permissionsToken,
-      action: "removed",
+      removed: permissions,
+      currentSigned: newPermissionsToken,
       role: this,
     });
 

src/controllers/UserController.ts

@@ -156,8 +156,6 @@ export default class UserController {
           )
       : [];
 
-    //    console.log(implicitPermissions);
-
     let checks = [
       (await this.fetchRoles()).map((v) => v.checkPermission(permission)),
     ].flatMap((v) => v);