🐛 Fix

apps/client-ts/src/components/Events/EventsTable.tsx

@@ -5,7 +5,6 @@ import { DataTableLoading } from "../shared/data-table-loading";
 import { events as Event } from "api";
 import { useEventsCount } from '@/hooks/get/useEventsCount';
 import { useQueryPagination } from '@/hooks/get/useQueryPagination';
-import useProjectStore from "@/state/projectStore";
 
 export default function EventsTable() {
   const { data: eventsCount } = useEventsCount();
@@ -22,14 +21,14 @@ export default function EventsTable() {
     pageSize: pagination.pageSize,
   });
 
-  //TODO
   const transformedEvents = events?.map((event: Event) => ({
-    method: event.method, // replace with actual value
-    url: event.url, // replace with actual value
+    method: event.method, 
+    url: event.url, 
     status: event.status,
-    direction: event.type, // replace with actual value
-    integration: event.provider, // replace with actual value + logo
-    date: event.timestamp.toLocaleString(), // convert Date to string
+    direction: event.type, 
+    integration: event.provider, 
+    id_linked_user: event.id_linked_user,
+    date: event.timestamp.toLocaleString(), 
   }));
 
   if(isLoading){

apps/client-ts/src/components/Events/columns.tsx

@@ -90,6 +90,22 @@ export const columns: ColumnDef<Event>[] = [
       return value.includes(row.getValue(id))
     },
   },
+  {
+    accessorKey: "id_linked_user",
+    header: ({ column }) => (
+      <DataTableColumnHeader column={column} title="Id Linked User" />
+    ),
+    cell: ({ row }) => {
+      return (
+        <div className="flex items-center">
+          <Badge variant="outline" className="rounded-sm py-1 font-normal">{row.getValue("id_linked_user")}</Badge>
+        </div>
+      )
+    },
+    filterFn: (row, id, value) => {
+      return value.includes(row.getValue(id))
+    },
+  },
   {
     accessorKey: "date",
     header: ({ column }) => (

apps/client-ts/src/components/Events/schema.ts

@@ -8,6 +8,7 @@ export const eventSchema = z.object({
   status: z.string(),
   direction: z.string(),
   integration: z.string(),
+  id_linked_user: z.string(),
   date: z.string()
 })
 

packages/api/src/@core/auth/auth.service.ts

@@ -14,7 +14,6 @@ import { handleServiceError } from '@@core/utils/errors';
 import { LoginDto } from './dto/login.dto';
 import { VerifyUserDto } from './dto/verify-user.dto';
 
-//TODO: Ensure the JWT is used for user session authentication and that it's short-lived.
 @Injectable()
 export class AuthService {
   constructor(

packages/api/src/@core/connections-strategies/connections-strategies.service.ts

@@ -30,7 +30,7 @@ export class ConnectionsStrategiesService {
     private prisma: PrismaService,
     private crypto: EncryptionService,
     private configService: ConfigService,
-  ) { }
+  ) {}
 
   async isCustomCredentials(projectId: string, type: string) {
     const res = await this.prisma.connection_strategies.findFirst({
@@ -82,7 +82,7 @@ export class ConnectionsStrategiesService {
           id_cs_attribute: uuidv4(),
           id_cs_entity: entity.id_cs_entity,
           attribute_slug: attribute_slug,
-          data_type: 'string', //TODO
+          data_type: 'string',
         },
       });
       const value_ = await this.prisma.cs_values.create({
@@ -230,8 +230,9 @@ export class ConnectionsStrategiesService {
           data = {
             ...data,
             SCOPE:
-              CONNECTORS_METADATA[vertical.toLowerCase()][provider.toLowerCase()]
-                .scopes,
+              CONNECTORS_METADATA[vertical.toLowerCase()][
+                provider.toLowerCase()
+              ].scopes,
           };
         }
         /*const isSubdomain = needsSubdomain(
@@ -337,7 +338,7 @@ export class ConnectionsStrategiesService {
     values: string[],
   ) {
     try {
-      console.log("In updateAPI xzx")
+      console.log('In updateAPI xzx');
       const cs = await this.prisma.connection_strategies.findFirst({
         where: {
           id_connection_strategy: id_cs,
@@ -368,7 +369,7 @@ export class ConnectionsStrategiesService {
           where: {
             id_cs_entity: id_cs_entity,
             attribute_slug: attribute_slug,
-            data_type: 'string', //TODO
+            data_type: 'string',
           },
         });
         const value_ = await this.prisma.cs_values.updateMany({
@@ -382,8 +383,8 @@ export class ConnectionsStrategiesService {
       }
       return cs;
     } catch (error) {
-      console.log("Error xzx")
-      console.log(error)
+      console.log('Error xzx');
+      console.log(error);
       throw new Error('Update Failed');
     }
   }

packages/api/src/@core/connections/ticketing/services/github/github.service.ts

@@ -21,7 +21,7 @@ export type GithubOAuthResponse = {
   access_token: string;
   refresh_token: string;
   expires_in: string;
-  refresh_token_expires_in: string; //TODO
+  refresh_token_expires_in: string;
   token_type: string;
   scope: string;
 };

packages/api/src/@core/events/events.controller.ts

@@ -41,7 +41,6 @@ export class EventsController {
     return await this.eventsService.findEvents(dto, id_project);
   }
 
-  // todo
   @ApiOperation({
     operationId: 'getEventsCount',
     summary: 'Retrieve Events Count',

packages/api/src/@core/project-connectors/project-connectors.controller.ts

@@ -67,8 +67,6 @@ export class ProjectConnectorsController {
     return await this.projectConnectorsService.createProjectConnectors(data);
   }
 
-  // It should be public API and don't have to add AuthGuard
-  // TODO: add admin control
   @ApiOperation({
     operationId: 'getConnectorsFromProject',
     summary: 'Retrieve connectors by Project Id',

packages/api/src/@core/utils/types/index.ts

@@ -1,6 +1,6 @@
 import { CrmObject, UnifiedCrm } from '@crm/@lib/@types';
 import { HrisObject } from '@hris/@lib/@types';
-import { AtsObject, UnifiedAts } from '@ats/@lib/@types';
+import { AtsObject } from '@ats/@lib/@types';
 import { AccountingObject } from '@accounting/@lib/@types';
 import { TicketingObject, UnifiedTicketing } from '@ticketing/@lib/@types';
 import {
@@ -14,7 +14,7 @@ import { Type, applyDecorators } from '@nestjs/common';
 import { FileStorageObject } from '@filestorage/@lib/@types';
 import { MarketingAutomationObject } from '@marketingautomation/@lib/@types';
 
-export type Unified = UnifiedCrm | UnifiedAts | UnifiedTicketing;
+export type Unified = UnifiedCrm | UnifiedTicketing;
 export type UnifyReturnType = Unified | Unified[];
 export type TargetObject =
   | CrmObject

packages/api/src/@core/webhook/webhook.service.ts

@@ -118,7 +118,7 @@ export class WebhookService {
           id_webhook_endpoint: webhook.id_webhook_endpoint,
           status: 'queued', // queued | processed | failed | success
           id_webhooks_payload: w_payload.id_webhooks_payload,
-          attempt_count: 0, //TODO
+          attempt_count: 0,
         },
       });
       this.logger.log('adding webhook to the queue ');
@@ -174,7 +174,7 @@ export class WebhookService {
           id_webhook_endpoint: webhook.id_webhook_endpoint,
           status: 'processed', // queued | processed | failed | success
           id_webhooks_payload: w_payload.id_webhooks_payload,
-          attempt_count: 0, //TODO
+          attempt_count: 0,
         },
       });
       this.logger.log('sending the webhook to the client ');

packages/api/src/ats/@lib/@types/index.ts

@@ -1,3 +1 @@
 export enum AtsObject {}
-
-export type UnifiedAts = ''; //TODO;

packages/api/src/crm/@lib/@utils/index.ts

@@ -113,10 +113,11 @@ export class Utils {
           remote_platform: remote_platform,
         },
       });
-      if (!res) return;
-      /*TODO: throw new Error(
+      if (!res) {
+        throw new Error(
           `crm_user not found for remote_id ${remote_id} and integration ${remote_platform}`,
-        );*/
+        );
+      }
       return res.id_crm_user;
     } catch (error) {
       throw new Error(error);
@@ -164,7 +165,9 @@ export class Utils {
           id_crm_company: uuid,
         },
       });
-      if (!res) return; //throw new Error(`crm_companies not found for uuid ${uuid}`);
+      if (!res) {
+        throw new Error(`crm_companies not found for uuid ${uuid}`);
+      }
       return res.remote_id;
     } catch (error) {
       throw new Error(error);
@@ -179,10 +182,11 @@ export class Utils {
           remote_platform: remote_platform,
         },
       });
-      if (!res) return;
-      /*throw new Error(
+      if (!res) {
+        throw new Error(
           `crm_companies not found for remote_id ${remote_id} and integration ${remote_platform}`,
-        );*/
+        );
+      }
       return res.id_crm_company;
     } catch (error) {
       throw new Error(error);
@@ -211,10 +215,11 @@ export class Utils {
           remote_platform: remote_platform,
         },
       });
-      if (!res) return;
-      /*TODO: throw new Error(
+      if (!res) {
+        throw new Error(
           `crm_deals_stages not found for remote_id ${remote_id} and integration ${remote_platform}`,
-        );*/
+        );
+      }
       return res.id_crm_deals_stage;
     } catch (error) {
       throw new Error(error);

packages/api/src/crm/company/services/company.service.ts

@@ -113,12 +113,10 @@ export class CompanyService {
       // add the company inside our db
       const source_company = resp.data;
       const target_company = unifiedObject[0];
-      const originId =
-        'id' in source_company ? String(source_company.id) : undefined; //TODO
 
       const existingCompany = await this.prisma.crm_companies.findFirst({
         where: {
-          remote_id: originId,
+          remote_id: target_company.remote_id,
           remote_platform: integrationId,
           id_linked_user: linkedUserId,
         },
@@ -253,7 +251,7 @@ export class CompanyService {
           created_at: new Date(),
           modified_at: new Date(),
           id_linked_user: linkedUserId,
-          remote_id: originId,
+          remote_id: target_company.remote_id,
           remote_platform: integrationId,
         };
 

packages/api/src/crm/company/sync/sync.service.ts

@@ -70,17 +70,6 @@ export class SyncService implements OnModuleInit {
   async syncCompanies(user_id?: string) {
     try {
       this.logger.log(`Syncing companies....`);
-      // TODO: insert inside sync_jobs table ?
-      /* 
-      {
-        "common_object": "company",
-        "vertical": "crm",
-        "last_sync_start": "",
-        "next_sync_start": "",
-        "status": "SYNCING",
-        "is_initial_sync": true,
-      }
-      */
       const users = user_id
         ? [
             await this.prisma.users.findUnique({

packages/api/src/crm/contact/services/contact.service.ts

@@ -112,16 +112,10 @@ export class ContactService {
       // add the contact inside our db
       const source_contact = resp.data;
       const target_contact = unifiedObject[0];
-      const originId =
-        'id' in source_contact
-          ? String(source_contact.id)
-          : 'contact_id' in source_contact
-          ? String(source_contact.contact_id)
-          : undefined;
 
       const existingContact = await this.prisma.crm_contacts.findFirst({
         where: {
-          remote_id: originId,
+          remote_id: target_contact.remote_id,
           remote_platform: integrationId,
           id_linked_user: linkedUserId,
         },
@@ -253,7 +247,7 @@ export class ContactService {
           created_at: new Date(),
           modified_at: new Date(),
           id_linked_user: linkedUserId,
-          remote_id: originId,
+          remote_id: target_contact.remote_id,
           remote_platform: integrationId,
         };
 

packages/api/src/crm/deal/services/deal.service.ts

@@ -118,11 +118,10 @@ export class DealService {
       // add the deal inside our db
       const source_deal = resp.data;
       const target_deal = unifiedObject[0];
-      const originId = 'id' in source_deal ? String(source_deal.id) : undefined; //TODO
 
       const existingDeal = await this.prisma.crm_deals.findFirst({
         where: {
-          remote_id: originId,
+          remote_id: target_deal.remote_id,
           remote_platform: integrationId,
           id_linked_user: linkedUserId,
         },
@@ -171,7 +170,7 @@ export class DealService {
           created_at: new Date(),
           modified_at: new Date(),
           id_linked_user: linkedUserId,
-          remote_id: originId,
+          remote_id: target_deal.remote_id,
           remote_platform: integrationId,
           description: '',
         };

packages/api/src/crm/engagement/services/engagement.service.ts

@@ -139,12 +139,10 @@ export class EngagementService {
       // add the engagement inside our db
       const source_engagement = resp.data;
       const target_engagement = unifiedObject[0];
-      const originId =
-        'id' in source_engagement ? String(source_engagement.id) : undefined; //TODO
 
       const existingEngagement = await this.prisma.crm_engagements.findFirst({
         where: {
-          remote_id: originId,
+          remote_id: target_engagement.remote_id,
           remote_platform: integrationId,
           id_linked_user: linkedUserId,
         },
@@ -202,7 +200,7 @@ export class EngagementService {
           created_at: new Date(),
           modified_at: new Date(),
           id_linked_user: linkedUserId,
-          remote_id: originId,
+          remote_id: target_engagement.remote_id,
           remote_platform: integrationId,
         };
 

packages/api/src/crm/note/services/note.service.ts

@@ -141,11 +141,10 @@ export class NoteService {
       // add the note inside our db
       const source_note = resp.data;
       const target_note = unifiedObject[0];
-      const originId = 'id' in source_note ? String(source_note.id) : undefined; //TODO
 
       const existingNote = await this.prisma.crm_notes.findFirst({
         where: {
-          remote_id: originId,
+          remote_id: target_note.remote_id,
           remote_platform: integrationId,
           id_linked_user: linkedUserId,
         },
@@ -189,7 +188,7 @@ export class NoteService {
           created_at: new Date(),
           modified_at: new Date(),
           id_linked_user: linkedUserId,
-          remote_id: originId,
+          remote_id: target_note.remote_id,
           remote_platform: integrationId,
         };
         if (target_note.content) {