Improvement activity log (#359)

Improved activity log

Author: munkhjin0223

activityLogs.ts

@@ -1,6 +1,6 @@
 import { Document, Schema } from 'mongoose';
 import { field } from '../utils';
-import { ACTIVITY_ACTIONS, ACTIVITY_PERFORMER_TYPES, ACTIVITY_TYPES, COC_CONTENT_TYPES } from './constants';
+import { ACTIVITY_ACTIONS, ACTIVITY_CONTENT_TYPES, ACTIVITY_PERFORMER_TYPES, ACTIVITY_TYPES } from './constants';
 
 export interface IActionPerformer {
   type: string;
@@ -22,23 +22,30 @@ interface IActivityDocument extends IActivity, Document {
   id?: string;
 }
 
-export interface ICoc {
+export interface IContentType {
   id: string;
   type: string;
 }
 
-interface ICocDocument extends ICoc, Document {
+interface IContentTypeDocument extends IContentType, Document {
   id: string;
 }
 
 export interface IActivityLogDocument extends Document {
   _id: string;
   activity: IActivityDocument;
   performedBy?: IActionPerformerDocument;
-  coc: ICocDocument;
+  contentType: IContentTypeDocument;
   createdAt: Date;
 }
 
+export interface IActivityLog {
+  contentType: string;
+  contentId: string;
+  activityType: string;
+  limit: number;
+}
+
 // Mongoose schemas ===========
 
 /* Performer of the action:
@@ -105,15 +112,15 @@ const activitySchema = new Schema(
 
 /* the customer that is related to a given ActivityLog
  can be both Company or Customer documents */
-const cocSchema = new Schema(
+const contentTypeSchema = new Schema(
   {
     id: field({
       type: String,
       required: true,
     }),
     type: field({
       type: String,
-      enum: COC_CONTENT_TYPES.ALL,
+      enum: ACTIVITY_CONTENT_TYPES.ALL,
       required: true,
     }),
   },
@@ -124,7 +131,9 @@ export const activityLogSchema = new Schema({
   _id: field({ pkey: true }),
   activity: { type: activitySchema },
   performedBy: { type: actionPerformerSchema, optional: true },
-  coc: { type: cocSchema },
+  contentType: { type: contentTypeSchema },
+  // TODO: remove
+  coc: { type: contentTypeSchema, optional: true },
 
   createdAt: field({
     type: Date,

companies.ts

@@ -5,6 +5,7 @@ import {
   COMPANY_INDUSTRY_TYPES,
   COMPANY_LEAD_STATUS_TYPES,
   COMPANY_LIFECYCLE_STATE_TYPES,
+  STATUSES,
 } from './constants';
 
 import { field } from '../utils';
@@ -37,7 +38,9 @@ export interface ICompany {
   primaryPhone?: string;
   phones?: string[];
 
+  mergedIds?: string[];
   leadStatus?: string;
+  status?: string;
   lifecycleState?: string;
   businessType?: string;
   description?: string;
@@ -52,6 +55,7 @@ export interface ICompany {
 export interface ICompanyDocument extends ICompany, Document {
   _id: string;
   links?: ILinkDocument;
+  status?: string;
   createdAt: Date;
   modifiedAt: Date;
 }
@@ -135,6 +139,14 @@ export const companySchema = new Schema({
     label: 'Lead Status',
   }),
 
+  status: field({
+    type: String,
+    enum: STATUSES.ALL,
+    default: STATUSES.ACTIVE,
+    optional: true,
+    label: 'Status',
+  }),
+
   lifecycleState: field({
     type: String,
     enum: COMPANY_LIFECYCLE_STATE_TYPES,
@@ -163,6 +175,9 @@ export const companySchema = new Schema({
     optional: true,
   }),
 
+  // Merged company ids
+  mergedIds: field({ type: [String], optional: true }),
+
   customFieldsData: field({
     type: Object,
   }),

constants.ts

@@ -163,7 +163,7 @@ export const FIELD_CONTENT_TYPES = {
   ALL: ['form', 'customer', 'company'],
 };
 
-export const COC_CONTENT_TYPES = {
+export const ACTIVITY_CONTENT_TYPES = {
   CUSTOMER: 'customer',
   COMPANY: 'company',
   USER: 'user',
@@ -198,9 +198,10 @@ export const ACTIVITY_ACTIONS = {
   CREATE: 'create',
   UPDATE: 'update',
   DELETE: 'delete',
+  MERGE: 'merge',
   SEND: 'send',
 
-  ALL: ['create', 'update', 'delete', 'send'],
+  ALL: ['create', 'update', 'delete', 'merge', 'send'],
 };
 
 export const ACTIVITY_PERFORMER_TYPES = {
@@ -389,3 +390,15 @@ export const PROBABILITY = {
   LOST: 'Lost',
   ALL: ['10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', 'Won', 'Lost'],
 };
+
+export const STATUSES = {
+  ACTIVE: 'Active',
+  DELETED: 'Deleted',
+  ALL: ['Active', 'Deleted'],
+};
+
+export const EMAIL_TYPES = {
+  GMAIL: 'gmail',
+  OTHER: 'other',
+  ALL: ['gmail', 'other'],
+};

customers.ts

@@ -1,6 +1,6 @@
 import { Document, Schema } from 'mongoose';
 
-import { CUSTOMER_LEAD_STATUS_TYPES, CUSTOMER_LIFECYCLE_STATE_TYPES } from './constants';
+import { CUSTOMER_LEAD_STATUS_TYPES, CUSTOMER_LIFECYCLE_STATE_TYPES, STATUSES } from './constants';
 
 import { field } from '../utils';
 
@@ -87,6 +87,8 @@ export interface ICustomer {
   integrationId?: string;
   tagIds?: string[];
   companyIds?: string[];
+  mergedIds?: string[];
+  status?: string;
   customFieldsData?: any;
   messengerData?: IMessengerData;
   twitterData?: ITwitterData;
@@ -104,6 +106,7 @@ export interface ICustomerDocument extends ICustomer, Document {
   location?: ILocationDocument;
   links?: ILinkDocument;
   visitorContactInfo?: IVisitorContactDocument;
+  status?: string;
   createdAt: Date;
   modifiedAt: Date;
 }
@@ -230,6 +233,14 @@ export const customerSchema = new Schema({
     label: 'Lead Status',
   }),
 
+  status: field({
+    type: String,
+    enum: STATUSES.ALL,
+    default: STATUSES.ACTIVE,
+    optional: true,
+    label: 'Status',
+  }),
+
   lifecycleState: field({
     type: String,
     enum: CUSTOMER_LIFECYCLE_STATE_TYPES,
@@ -252,6 +263,9 @@ export const customerSchema = new Schema({
   tagIds: field({ type: [String], optional: true }),
   companyIds: field({ type: [String], optional: true }),
 
+  // Merged customer ids
+  mergedIds: field({ type: [String], optional: true }),
+
   customFieldsData: field({ type: Object, optional: true }),
   messengerData: field({ type: messengerSchema, optional: true }),
   twitterData: field({ type: twitterSchema, optional: true }),

emailDeliveries.ts

@@ -0,0 +1,58 @@
+import { Document, Schema } from 'mongoose';
+import { field } from '../utils';
+import { EMAIL_TYPES } from './constants';
+
+interface IAttachmentParams {
+  data: string;
+  filename: string;
+  size: number;
+  mimeType: string;
+}
+
+export interface IEmailDeliveries {
+  cocType: string;
+  cocId: string;
+  subject: string;
+  body: string;
+  toEmails: string;
+  cc?: string;
+  bcc?: string;
+  attachments?: IAttachmentParams[];
+  fromEmail?: string;
+  type?: string;
+  userId: string;
+}
+
+export interface IEmailDeliveriesDocument extends IEmailDeliveries, Document {
+  id: string;
+}
+
+// Mongoose schemas ===========
+
+const attachmentSchema = new Schema(
+  {
+    data: field({ type: String }),
+    filename: field({ type: String }),
+    size: field({ type: Number }),
+    mimeType: field({ type: String }),
+  },
+  { _id: false },
+);
+
+export const emailDeliverySchema = new Schema({
+  _id: field({ pkey: true }),
+  cocType: field({ type: String }),
+  cocId: field({ type: String }),
+  subject: field({ type: String, optional: true }),
+  body: field({ type: String }),
+  toEmails: field({ type: String }),
+  cc: field({ type: String, optional: true }),
+  bcc: field({ type: String, optional: true }),
+  attachments: field({ type: [attachmentSchema] }),
+  fromEmail: field({ type: String }),
+  userId: field({ type: String }),
+
+  type: { type: String, enum: EMAIL_TYPES.ALL, default: EMAIL_TYPES.GMAIL },
+
+  createdAt: field({ type: Date, default: Date.now }),
+});

internalNotes.ts

@@ -1,6 +1,6 @@
 import { Document, Schema } from 'mongoose';
 import { field } from '../utils';
-import { COC_CONTENT_TYPES } from './constants';
+import { ACTIVITY_CONTENT_TYPES } from './constants';
 
 export interface IInternalNote {
   contentType: string;
@@ -20,7 +20,7 @@ export const internalNoteSchema = new Schema({
   _id: field({ pkey: true }),
   contentType: field({
     type: String,
-    enum: COC_CONTENT_TYPES.ALL,
+    enum: ACTIVITY_CONTENT_TYPES.ALL,
   }),
   contentTypeId: field({ type: String }),
   content: field({

segments.ts

@@ -1,6 +1,6 @@
 import { Document, Schema } from 'mongoose';
 import { field } from '../utils';
-import { COC_CONTENT_TYPES } from './constants';
+import { ACTIVITY_CONTENT_TYPES } from './constants';
 
 export interface ICondition {
   field: string;
@@ -51,7 +51,7 @@ export const segmentSchema = new Schema({
   _id: field({ pkey: true }),
   contentType: field({
     type: String,
-    enum: COC_CONTENT_TYPES.ALL,
+    enum: ACTIVITY_CONTENT_TYPES.ALL,
   }),
   name: field({ type: String }),
   description: field({ type: String, optional: true }),