Merge pull request #447 from chaynHQ/develop

Merge Develop onto Main

README.md

@@ -129,9 +129,9 @@ ZAPIER_TOKEN=
 SLACK_WEBHOOK_URL=
 CRISP_TOKEN=
 CRISP_WEBSITE_TOKEN=
-MAILCHIMP_MANDRILL_API_KEY=
-MAILCHIMP_THERAPY_TEMPLATE_ID=
-MAILCHIMP_THERAPY_FROM_EMAIL=
+MAILCHIMP_API_KEY=
+MAILCHIMP_AUDIENCE_ID=
+MAILCHIMP_SERVER_PREFIX=
 RESPOND_IO_CREATE_CONTACT_WEBHOOK=
 RESPOND_IO_DELETE_CONTACT_WEBHOOK=
 ```

docker-compose.yml

@@ -1,7 +1,6 @@
 version: '3.9'
 
 services:
-
   api:
     container_name: bloom-backend
     build:
@@ -16,7 +15,7 @@ services:
     volumes:
       - .:/app
 
-  db: 
+  db:
     image: postgres:14-alpine
     container_name: bloom-local-db
     restart: unless-stopped
@@ -25,4 +24,4 @@ services:
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: bloom
+      POSTGRES_DB: bloom

package.json

@@ -29,7 +29,7 @@
     "migration:show": "yarn build && yarn typeorm -- migration:show"
   },
   "dependencies": {
-    "@mailchimp/mailchimp_transactional": "^1.0.47",
+    "@mailchimp/mailchimp_marketing": "^3.0.80",
     "@nestjs/common": "^10.3.6",
     "@nestjs/config": "^3.2.2",
     "@nestjs/core": "^10.3.6",

src/api/crisp/crisp-api.interfaces.ts

@@ -1,41 +1,56 @@
-export interface CrispResponse {
-  error: boolean;
-  reason: string;
-  data: {
-    data: unknown;
-  };
+export interface CrispProfileCustomFields {
+  signed_up_at?: string;
+  language?: string;
+  marketing_permission?: boolean;
+  service_emails_permission?: boolean;
+  partners?: string;
+  feature_live_chat?: boolean;
+  feature_therapy?: boolean;
+  therapy_sessions_remaining?: number;
+  therapy_sessions_redeemed?: number;
+  course_hst?: string;
+  course_hst_sessions?: string;
+  course_pst?: string;
+  course_pst_sessions?: string;
+  course_dbr?: string;
+  course_dbr_sessions?: string;
+  course_iaro?: string;
+  course_iaro_sessions?: string;
+  course_rtar?: string;
+  course_rtar_sessions?: string;
+  course_rryts?: string;
+  course_rryts_sessions?: string;
+  course_ma?: string;
+  course_ma_sessions?: string;
+  course_cb?: string;
+  course_cb_sessions?: string;
 }
-export interface CrispProfileResponse {
-  error: boolean;
-  reason: string;
-  data: {
-    segments: string[];
-  };
-}
-export interface NewPeopleProfile {
-  email: string;
-  person: {
-    nickname: string;
-  };
-  segments: string[];
-}
-
-export interface UpdatePeopleProfile {
+export interface CrispProfileBase {
   email?: string;
   person?: {
     nickname: string;
+    locales: string[];
   };
   segments?: string[];
+  notepad?: string;
+  active?: number;
+  // company?: {}
 }
 
-export interface NewPeopleProfileResponse extends CrispResponse {
-  data: {
-    data: {
-      people_id: string;
-    };
+export interface CrispProfileBaseResponse {
+  error: boolean;
+  reason: string;
+  data: CrispProfileBase & {
+    people_id: string;
   };
 }
 
-export interface PeopleData {
-  [key: string]: string | number | boolean;
+export interface NewCrispProfileBaseResponse {
+  data: CrispProfileBaseResponse;
+}
+
+export interface CrispProfileDataResponse {
+  error: boolean;
+  reason: string;
+  data: { data: CrispProfileCustomFields };
 }