segments for tags, tasks, widgets - filtering fixed

Author: epipav

backend/src/database/migrations/V1683110675__segments.sql

@@ -2,6 +2,7 @@ create type public."segmentsStatus_type" AS ENUM ('active', 'archived', 'formati
 
 create table "segments" (
     "id" uuid not null,
+    url text null,
     name text null,
     "parentName" text null,
     "grandparentName" text null,
@@ -26,4 +27,27 @@ ALTER TABLE "activities" ADD COLUMN "segmentId" uuid;
 
 ALTER TABLE "integrations" ADD COLUMN "segmentId" uuid;
 
-ALTER TABLE "conversations" ADD COLUMN "segmentId" uuid;
+ALTER TABLE "conversations" ADD COLUMN "segmentId" uuid;
+
+ALTER TABLE "tags" ADD COLUMN "segmentId" uuid;
+
+ALTER TABLE "tasks" ADD COLUMN "segmentId" uuid;
+
+ALTER TABLE "reports" ADD COLUMN "segmentId" uuid;
+
+ALTER TABLE "widgets" ADD COLUMN "segmentId" uuid;
+
+
+CREATE TABLE public."memberSegments" (
+    "memberId" uuid NOT NULL,
+    "segmentId" uuid NOT NULL,
+    "tenantId" uuid NOT NULL,
+    "createdAt" timestamp with time zone NOT NULL,
+    foreign key ("tenantId") references tenants (id),
+    foreign key ("segmentId") references segments (id),
+    foreign key ("memberId") references members (id),
+    unique("memberId", "segmentId", "tenantId")
+    -- create index for memberId, segmentId and tenantId
+);
+
+

backend/src/database/models/member.ts

@@ -101,6 +101,11 @@ export default (sequelize) => {
       foreignKey: 'memberId',
     })
 
+    models.member.belongsToMany(models.segment, {
+      as: 'segments',
+      through: 'memberSegments',
+    })
+
     models.member.hasOne(models.memberActivityAggregatesMV, {
       as: 'memberActivityAggregatesMVs',
       foreignKey: 'id',

backend/src/database/models/report.ts

@@ -64,6 +64,13 @@ export default (sequelize) => {
       },
     })
 
+    models.report.belongsTo(models.segment, {
+      as: 'segment',
+      foreignKey: {
+        allowNull: false,
+      },
+    })
+
     models.report.belongsTo(models.user, {
       as: 'createdBy',
     })

backend/src/database/models/segment.ts

@@ -9,6 +9,9 @@ export default (sequelize) => {
         defaultValue: DataTypes.UUIDV4,
         primaryKey: true,
       },
+      url: {
+        type: DataTypes.TEXT,
+      },
       name: {
         type: DataTypes.TEXT,
       },

backend/src/database/models/tag.ts

@@ -57,6 +57,13 @@ export default (sequelize) => {
       },
     })
 
+    models.tag.belongsTo(models.segment, {
+      as: 'segment',
+      foreignKey: {
+        allowNull: false,
+      },
+    })
+
     models.tag.belongsTo(models.user, {
       as: 'createdBy',
     })

backend/src/database/models/task.ts

@@ -82,6 +82,13 @@ export default (sequelize) => {
       },
     })
 
+    models.task.belongsTo(models.segment, {
+      as: 'segment',
+      foreignKey: {
+        allowNull: false,
+      },
+    })
+
     models.task.belongsToMany(models.user, {
       as: 'assignees',
       through: 'taskAssignees',

backend/src/database/models/widget.ts

@@ -60,6 +60,13 @@ export default (sequelize) => {
       },
     })
 
+    models.widget.belongsTo(models.segment, {
+      as: 'segment',
+      foreignKey: {
+        allowNull: false,
+      },
+    })
+
     models.widget.belongsTo(models.user, {
       as: 'createdBy',
     })

backend/src/database/repositories/filters/queryParser.ts

@@ -404,6 +404,7 @@ class QueryParser {
     const dbQuery: any = {
       where: {
         tenantId: SequelizeRepository.getCurrentTenant(this.options).id,
+        segmentId: this.options.currentSegments.map((s) => s.id),
       },
       limit: QueryParser.defaultPageSize,
       offset: 0,

backend/src/database/repositories/memberRepository.ts

@@ -26,6 +26,7 @@ import {
 } from './types/memberTypes'
 import { ActivityDisplayVariant } from '../../types/activityTypes'
 import SegmentRepository from './segmentRepository'
+import { SegmentData } from '../../types/segmentTypes'
 
 const { Op } = Sequelize
 
@@ -99,6 +100,8 @@ class MemberRepository {
       }
     }
 
+    await MemberRepository.includeMemberToSegments(record.id, options)
+
     await record.setActivities(data.activities || [], {
       transaction,
     })
@@ -129,6 +132,36 @@ class MemberRepository {
     return this.findById(record.id, options, true, doPopulateRelations)
   }
 
+  static async includeMemberToSegments(memberId: string, options: IRepositoryOptions) {
+    const seq = SequelizeRepository.getSequelize(options)
+
+    const transaction = SequelizeRepository.getTransaction(options)
+
+    let bulkInsertMemberSegments = `INSERT INTO "memberSegments" ("memberId","segmentId", "tenantId", "createdAt") VALUES `
+    const replacements = {
+      memberId,
+      tenantId: options.currentTenant.id,
+    }
+
+    for (let idx = 0; idx < options.currentSegments.length; idx++) {
+      bulkInsertMemberSegments += ` (:memberId, :segmentId${idx}, :tenantId, now()) `
+
+      replacements[`segmentId${idx}`] = options.currentSegments[idx].id
+
+      if (idx !== options.currentSegments.length - 1) {
+        bulkInsertMemberSegments += `,`
+      }
+    }
+
+    bulkInsertMemberSegments += ` ON CONFLICT DO NOTHING`
+
+    await seq.query(bulkInsertMemberSegments, {
+      replacements,
+      type: QueryTypes.INSERT,
+      transaction,
+    })
+  }
+
   static async findSampleDataMemberIds(options: IRepositoryOptions) {
     const transaction = SequelizeRepository.getTransaction(options)
     const currentTenant = SequelizeRepository.getCurrentTenant(options)
@@ -482,6 +515,7 @@ class MemberRepository {
       where: {
         id,
         tenantId: currentTenant.id,
+        segmentId: options.currentSegments.map((s) => s.id),
       },
       transaction,
     })
@@ -634,6 +668,7 @@ class MemberRepository {
       where: {
         id,
         tenantId: currentTenant.id,
+        segmentId: options.currentSegments.map((s) => s.id),
       },
       transaction,
     })
@@ -659,12 +694,39 @@ class MemberRepository {
       where: {
         id: ids,
         tenantId: currentTenant.id,
+        segmentId: options.currentSegments.map((s) => s.id),
       },
       force,
       transaction,
     })
   }
 
+  static async getSegments(
+    memberIds: string[],
+    options: IRepositoryOptions,
+  ): Promise<Map<string, SegmentData[]>> {
+    const results = new Map<string, SegmentData[]>()
+
+    const transaction = SequelizeRepository.getTransaction(options)
+    const seq = SequelizeRepository.getSequelize(options)
+
+    const query = `
+      select "memberId", "segmentId", "tenantId", "createdAt" from "memberSegments" where "memberId" in (:memberIds) order by "createdAt" asc;
+    `
+
+    await seq.query(query, {
+      replacements: {
+        memberIds,
+      },
+      type: QueryTypes.SELECT,
+      transaction,
+    })
+
+    // TODO: complete
+
+    return results
+  }
+
   static async getIdentities(
     memberIds: string[],
     options: IRepositoryOptions,
@@ -725,6 +787,7 @@ class MemberRepository {
     if (!ignoreTenant) {
       const currentTenant = SequelizeRepository.getCurrentTenant(options)
       where.tenantId = currentTenant.id
+      where.segmentId = options.currentSegments.map((s) => s.id)
     }
 
     const record = await options.database.member.findOne({

backend/src/database/repositories/reportRepository.ts

@@ -18,11 +18,14 @@ class ReportRepository {
 
     const transaction = SequelizeRepository.getTransaction(options)
 
+    const segment = SequelizeRepository.getStrictlySingleActiveSegment(options)
+
     const record = await options.database.report.create(
       {
         ...lodash.pick(data, ['name', 'public', 'importHash', 'isTemplate', 'viewedBy']),
 
         tenantId: tenant.id,
+        segmentId: segment.id,
         createdById: currentUser.id,
         updatedById: currentUser.id,
       },
@@ -51,6 +54,7 @@ class ReportRepository {
       where: {
         id,
         tenantId: currentTenant.id,
+        segmentId: options.currentSegments.map((s) => s.id),
       },
       transaction,
     })
@@ -90,6 +94,7 @@ class ReportRepository {
       where: {
         id,
         tenantId: currentTenant.id,
+        segmentId: options.currentSegments.map((s) => s.id),
       },
       transaction,
     })
@@ -116,6 +121,7 @@ class ReportRepository {
       where: {
         id,
         tenantId: currentTenant.id,
+        segmentId: options.currentSegments.map((s) => s.id),
       },
       include,
       transaction,
@@ -163,6 +169,7 @@ class ReportRepository {
       where: {
         ...filter,
         tenantId: tenant.id,
+        segmentId: options.currentSegments.map((s) => s.id),
       },
       transaction,
     })
@@ -259,6 +266,9 @@ class ReportRepository {
       {
         tenantId: tenant.id,
       },
+      {
+        segmentId: options.currentSegments.map((s) => s.id),
+      },
     ]
 
     if (query) {