Merge pull request #108 from panoratech/feat/shared-package

🐛 Env fix db
panoratech · Dec 3, 2023 · 91e94f6 · 91e94f6
2 parents dcb38af + 2219a2b
commit 91e94f6
Show file tree

Hide file tree

Showing 11 changed files with 1,183 additions and 140 deletions.
diff --git a/package.json b/package.json
@@ -24,10 +24,11 @@
     ]
   },
   "dependencies": {
-    "@changesets/cli": "^2.26.2"
+    "@changesets/cli": "^2.26.2",
+    "gitmoji-cli": "^9.0.0"
   },
   "private": true,
   "engines": {
-  "node": ">=16.14.2"
-}
+    "node": ">=16.14.2"
+  }
 }
diff --git a/packages/api/exports.ts b/packages/api/exports.ts
@@ -0,0 +1 @@
+export * from '@prisma/client';
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -18,7 +18,8 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
-    "ci": "pnpm run lint && pnpm run build"
+    "ci": "pnpm run lint && pnpm run build",
+    "copy-types-to-shared": "cp ./exports.ts ../shared/index.ts"
   },
   "dependencies": {
     "@nestjs/common": "^10.0.0",

diff --git a/packages/api/prisma/schema.prisma b/packages/api/prisma/schema.prisma
@@ -19,36 +19,20 @@ model api_keys {
   @@index([id_project], map: "fk_api_keys_projects")
 }
 
-model crm_contact_email_addresses {
-  id_crm_contact_email String         @id(map: "pk_crm_contact_email_addresses") @db.Uuid
-  email_address        String
-  email_address_type   String
-  owner_type           String
-  created_at           DateTime       @db.Timestamp(6)
-  modified_at          DateTime       @db.Timestamp(6)
-  id_crm_company       String?        @db.Uuid
-  id_crm_contact       String?        @db.Uuid
-  crm_companies        crm_companies? @relation(fields: [id_crm_company], references: [id_crm_company], onDelete: NoAction, onUpdate: NoAction, map: "fk_16")
-  crm_contacts         crm_contacts?  @relation(fields: [id_crm_contact], references: [id_crm_contact], onDelete: NoAction, onUpdate: NoAction, map: "fk_3")
-
-  @@index([id_crm_contact], map: "crm_contactid_crm_contact_email_address")
-  @@index([id_crm_company], map: "fk_contact_email_adress_companyid")
-}
-
 model crm_contacts {
-  id_crm_contact              String                        @id(map: "pk_crm_contacts") @db.Uuid
-  first_name                  String
-  last_name                   String
-  created_at                  DateTime                      @db.Timestamp(6)
-  modified_at                 DateTime                      @db.Timestamp(6)
-  id_job                      String                        @db.Uuid
-  id_crm_user                 String?                       @db.Uuid
-  crm_addresses               crm_addresses[]
-  crm_contact_email_addresses crm_contact_email_addresses[]
-  crm_users                   crm_users?                    @relation(fields: [id_crm_user], references: [id_crm_user], onDelete: NoAction, onUpdate: NoAction, map: "fk_23")
-  jobs                        jobs                          @relation(fields: [id_job], references: [id_job], onDelete: NoAction, onUpdate: NoAction, map: "job_id_crm_contact")
-  crm_notes                   crm_notes[]
-  crm_phone_numbers           crm_phone_numbers[]
+  id_crm_contact      String                @id(map: "pk_crm_contacts") @db.Uuid
+  first_name          String
+  last_name           String
+  created_at          DateTime              @db.Timestamp(6)
+  modified_at         DateTime              @db.Timestamp(6)
+  id_job              String                @db.Uuid
+  id_crm_user         String?               @db.Uuid
+  crm_addresses       crm_addresses[]
+  crm_users           crm_users?            @relation(fields: [id_crm_user], references: [id_crm_user], onDelete: NoAction, onUpdate: NoAction, map: "fk_23")
+  jobs                jobs                  @relation(fields: [id_job], references: [id_job], onDelete: NoAction, onUpdate: NoAction, map: "job_id_crm_contact")
+  crm_email_addresses crm_email_addresses[]
+  crm_notes           crm_notes[]
+  crm_phone_numbers   crm_phone_numbers[]
 
   @@index([id_job], map: "crm_contact_id_job")
   @@index([id_crm_user], map: "fk_crm_contact_userid")
@@ -185,22 +169,22 @@ model crm_addresses {
 }
 
 model crm_companies {
-  id_crm_company              String                        @id(map: "pk_crm_companies") @db.Uuid
-  name                        String?
-  industry                    String?
-  number_of_employees         BigInt?
-  created_at                  DateTime                      @db.Timestamp(6)
-  modified_at                 DateTime                      @db.Timestamp(6)
-  id_job                      String                        @db.Uuid
-  id_crm_user                 String?                       @db.Uuid
-  crm_addresses               crm_addresses[]
-  jobs                        jobs                          @relation(fields: [id_job], references: [id_job], onDelete: NoAction, onUpdate: NoAction, map: "fk_13")
-  crm_users                   crm_users?                    @relation(fields: [id_crm_user], references: [id_crm_user], onDelete: NoAction, onUpdate: NoAction, map: "fk_24")
-  crm_contact_email_addresses crm_contact_email_addresses[]
-  crm_engagements             crm_engagements[]
-  crm_notes                   crm_notes[]
-  crm_phone_numbers           crm_phone_numbers[]
-  crm_tasks                   crm_tasks[]
+  id_crm_company      String                @id(map: "pk_crm_companies") @db.Uuid
+  name                String?
+  industry            String?
+  number_of_employees BigInt?
+  created_at          DateTime              @db.Timestamp(6)
+  modified_at         DateTime              @db.Timestamp(6)
+  id_job              String                @db.Uuid
+  id_crm_user         String?               @db.Uuid
+  crm_addresses       crm_addresses[]
+  jobs                jobs                  @relation(fields: [id_job], references: [id_job], onDelete: NoAction, onUpdate: NoAction, map: "fk_13")
+  crm_users           crm_users?            @relation(fields: [id_crm_user], references: [id_crm_user], onDelete: NoAction, onUpdate: NoAction, map: "fk_24")
+  crm_email_addresses crm_email_addresses[]
+  crm_engagements     crm_engagements[]
+  crm_notes           crm_notes[]
+  crm_phone_numbers   crm_phone_numbers[]
+  crm_tasks           crm_tasks[]
 
   @@index([id_crm_user], map: "fk_crm_company_crm_userid")
   @@index([id_job], map: "fk_crm_company_jobid")
@@ -235,11 +219,11 @@ model crm_deals_stages {
 
 model crm_engagement_contacts {
   id_crm_engagement_contact String          @id(map: "pk_crm_engagement_contact") @db.Uuid
-  uuid_crm_engagement       String          @db.Uuid
   id_crm_contact            String?         @db.Uuid
-  crm_engagements           crm_engagements @relation(fields: [uuid_crm_engagement], references: [uuid_crm_engagement], onDelete: NoAction, onUpdate: NoAction, map: "fk_30")
+  id_crm_engagement         String          @db.Uuid
+  crm_engagements           crm_engagements @relation(fields: [id_crm_engagement], references: [id_crm_engagement], onDelete: NoAction, onUpdate: NoAction, map: "fk_30")
 
-  @@index([uuid_crm_engagement], map: "fk_crm_engagement_contacts_crmengagementid")
+  @@index([id_crm_engagement], map: "fk_crm_engagement_contacts_crmengagementid")
   @@index([id_crm_contact], map: "fk_engagement_contact_crmcontactid")
 }
 
@@ -255,7 +239,7 @@ model crm_engagement_types {
 }
 
 model crm_engagements {
-  uuid_crm_engagement     String                    @id(map: "pk_crm_engagement") @db.Uuid
+  id_crm_engagement       String                    @id(map: "pk_crm_engagement") @db.Uuid
   content                 String?
   direction               String?
   subject                 String?
@@ -324,7 +308,7 @@ model attribute {
   source               String
   id_entity            String  @db.Uuid
   scope                String
-  id_consumer          String  @db.Uuid
+  id_consumer          String? @db.Uuid
   entity               entity  @relation(fields: [id_entity], references: [id_entity], onDelete: NoAction, onUpdate: NoAction, map: "fk_32")
   value                value[]
 
@@ -354,17 +338,34 @@ model value {
 
 /// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments
 model crm_phone_numbers {
-  id_crm_contacts_phone_number String         @id(map: "pk_crm_contacts_phone_numbers") @db.Uuid
-  phone_number                 String
-  phone_type                   String
-  owner_type                   String
-  created_at                   DateTime       @db.Timestamp(6)
-  modified_at                  DateTime       @db.Timestamp(6)
-  id_crm_company               String?        @db.Uuid
-  id_crm_contact               String?        @db.Uuid
-  crm_companies                crm_companies? @relation(fields: [id_crm_company], references: [id_crm_company], onDelete: NoAction, onUpdate: NoAction, map: "fk_17")
-  crm_contacts                 crm_contacts?  @relation(fields: [id_crm_contact], references: [id_crm_contact], onDelete: NoAction, onUpdate: NoAction, map: "fk_phonenumber_crm_contactid")
+  id_crm_phone_number String         @id(map: "pk_crm_contacts_phone_numbers") @db.Uuid
+  phone_number        String
+  phone_type          String
+  owner_type          String
+  created_at          DateTime       @db.Timestamp(6)
+  modified_at         DateTime       @db.Timestamp(6)
+  id_crm_company      String?        @db.Uuid
+  id_crm_contact      String?        @db.Uuid
+  crm_companies       crm_companies? @relation(fields: [id_crm_company], references: [id_crm_company], onDelete: NoAction, onUpdate: NoAction, map: "fk_17")
+  crm_contacts        crm_contacts?  @relation(fields: [id_crm_contact], references: [id_crm_contact], onDelete: NoAction, onUpdate: NoAction, map: "fk_phonenumber_crm_contactid")
 
   @@index([id_crm_contact], map: "crm_contactid_crm_contact_phone_number")
   @@index([id_crm_company], map: "fk_phone_number_companyid")
 }
+
+/// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments
+model crm_email_addresses {
+  id_crm_email       String         @id(map: "pk_crm_contact_email_addresses") @db.Uuid
+  email_address      String
+  email_address_type String
+  owner_type         String
+  created_at         DateTime       @db.Timestamp(6)
+  modified_at        DateTime       @db.Timestamp(6)
+  id_crm_company     String?        @db.Uuid
+  id_crm_contact     String?        @db.Uuid
+  crm_companies      crm_companies? @relation(fields: [id_crm_company], references: [id_crm_company], onDelete: NoAction, onUpdate: NoAction, map: "fk_16")
+  crm_contacts       crm_contacts?  @relation(fields: [id_crm_contact], references: [id_crm_contact], onDelete: NoAction, onUpdate: NoAction, map: "fk_3")
+
+  @@index([id_crm_contact], map: "crm_contactid_crm_contact_email_address")
+  @@index([id_crm_company], map: "fk_contact_email_adress_companyid")
+}
diff --git a/packages/api/src/crm/contact/services/contact.service.ts b/packages/api/src/crm/contact/services/contact.service.ts
@@ -50,7 +50,7 @@ export class ContactService {
       owner_type: email.owner_type ? email.owner_type : '',
       created_at: new Date(),
       modified_at: new Date(),
-      id_crm_contact_email: uuidv4(),
+      id_crm_email: uuidv4(), // This line is changed
       email_address_type:
         email.email_address_type === '' ? 'work' : email.email_address_type,
     }));
@@ -60,9 +60,7 @@ export class ContactService {
       owner_type: phone.owner_type ? phone.owner_type : '',
       created_at: new Date(),
       modified_at: new Date(),
-      //id_crm_company: '1', //TODO
-      //id_crm_contact: '1', //TODO
-      id_crm_contacts_phone_number: uuidv4(),
+      id_crm_phone_number: uuidv4(), // This line is changed
       phone_type: phone.phone_type === '' ? 'work' : phone.phone_type,
     }));
 
@@ -90,7 +88,7 @@ export class ContactService {
         modified_at: new Date(),
         first_name: first_name,
         last_name: last_name,
-        crm_contact_email_addresses: {
+        crm_email_addresses: {
           create: normalizedEmails,
         },
         crm_phone_numbers: {

diff --git a/packages/shared/index.ts b/packages/shared/index.ts
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "shared",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "tsc"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/node": "^20.3.1",
+    "@typescript-eslint/eslint-plugin": "^6.13.1",
+    "@typescript-eslint/parser": "^6.13.1",
+    "eslint": "^8.55.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "prettier": "^2.8.8",
+    "typescript": "^5.3.2"
+  }
+}
diff --git a/packages/webapp/src/components/jobs/JobsTable.tsx b/packages/webapp/src/components/jobs/JobsTable.tsx
@@ -14,16 +14,28 @@ export interface Job {
 
 export default function JobsTable() {
   const { data: jobs, isLoading, error } = useJobs();
+
   if(isLoading){
     console.log("loading jobs..");
   }
+
   if(error){
     console.log("error jobs..");
   }
 
+  const transformedJobs = jobs?.map(job => ({
+    method: '', // replace with actual value
+    url: '', // replace with actual value
+    status: job.status,
+    direction: '', // replace with actual value
+    integration: '', // replace with actual value
+    organisation: '', // replace with actual value
+    date: job.timestamp.toString(), // convert Date to string
+  }));
+
   return (
     <>
-      {jobs && <DataTable data={jobs} columns={columns} />}
+      {transformedJobs && <DataTable data={transformedJobs} columns={columns} />}
     </>
   )
 }
diff --git a/packages/webapp/src/hooks/useJobs.tsx b/packages/webapp/src/hooks/useJobs.tsx
@@ -1,28 +1,19 @@
 import config from '@/utils/config';
 import { useQuery } from '@tanstack/react-query';
+import {jobs as Jobs} from "@api/exports";
 
-
-//TODO: import from shared type 
-export interface Job {
-  method: string; 
-  url: string; 
-  status: string; 
-  direction: string; 
-  integration: string;
-  organisation: string;
-  date: string;
+const fetchJobs = async (): Promise<Jobs[]> => {
+  const response = await fetch(`${config.API_URL}/jobs`);
+  if (!response.ok) {
+    throw new Error('Network response was not ok');
+  }
+  return response.json();
 }
 
 const useJobs = () => {
   return useQuery({
     queryKey: ['jobs'], 
-    queryFn: async () => {
-      const response = await fetch(`${config.API_URL}/jobs`);
-        if (!response.ok) {
-          throw new Error('Network response was not ok');
-        }
-        return response.json();
-    }
+    queryFn: fetchJobs
   });
 };
 

diff --git a/packages/webapp/tsconfig.json b/packages/webapp/tsconfig.json
@@ -9,6 +9,9 @@
     "paths": {
       "@/*": [
         "./src/*"
+      ],
+      "@api/*": [
+        "./../api/*"
       ]
     },
     /* Bundler mode */