refactor: move Sequelize query executor out of DAL into backend

backend/src/api/member/memberMerge.ts

@@ -1,5 +1,6 @@
 import { CommonMemberService, invalidateMemberQueryCache } from '@crowd/common_services'
-import { optionsQx } from '@crowd/data-access-layer'
+
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 
 import Permissions from '../../security/permissions'
 import track from '../../segment/track'

backend/src/api/public/middlewares/staticApiKeyMiddleware.ts

@@ -2,7 +2,9 @@ import crypto from 'crypto'
 import type { NextFunction, Request, RequestHandler, Response } from 'express'
 
 import { UnauthorizedError } from '@crowd/common'
-import { findApiKeyByHash, optionsQx, touchApiKeyLastUsed } from '@crowd/data-access-layer'
+import { findApiKeyByHash, touchApiKeyLastUsed } from '@crowd/data-access-layer'
+
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 
 export function staticApiKeyMiddleware(): RequestHandler {
   return async (req: Request, _res: Response, next: NextFunction): Promise<void> => {

backend/src/api/public/v1/affiliations/getAffiliationByHandle.ts

@@ -4,10 +4,10 @@ import { NotFoundError } from '@crowd/common'
 import {
   findMembersByGithubHandles,
   findVerifiedEmailsByMemberIds,
-  optionsQx,
   resolveAffiliationsByMemberIds,
 } from '@crowd/data-access-layer'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { ok } from '@/utils/api'
 
 export async function getAffiliationByHandle(req: Request, res: Response): Promise<void> {

backend/src/api/public/v1/affiliations/getAffiliations.ts

@@ -4,10 +4,10 @@ import { z } from 'zod'
 import {
   findMembersByGithubHandles,
   findVerifiedEmailsByMemberIds,
-  optionsQx,
   resolveAffiliationsByMemberIds,
 } from '@crowd/data-access-layer'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { ok } from '@/utils/api'
 import { validateOrThrow } from '@/utils/validation'
 

backend/src/api/public/v1/members/createMember.ts

@@ -3,13 +3,10 @@ import { z } from 'zod'
 
 import { captureApiChange, memberCreateAction, memberEditIdentitiesAction } from '@crowd/audit-logs'
 import { getProperDisplayName } from '@crowd/common'
-import {
-  insertManyMemberIdentities,
-  createMember as insertMember,
-  optionsQx,
-} from '@crowd/data-access-layer'
+import { insertManyMemberIdentities, createMember as insertMember } from '@crowd/data-access-layer'
 import { MemberIdentityType } from '@crowd/types'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { created } from '@/utils/api'
 import { rethrowDbConflict } from '@/utils/err'
 import { validateOrThrow } from '@/utils/validation'

backend/src/api/public/v1/members/identities/createMemberIdentity.ts

@@ -8,12 +8,12 @@ import {
   findMemberById,
   findMemberIdentitiesByValue,
   createMemberIdentity as insertMemberIdentity,
-  optionsQx,
   touchMemberUpdatedAt,
   updateMemberIdentity,
 } from '@crowd/data-access-layer'
 import { IMemberIdentity, MemberIdentityType } from '@crowd/types'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { created, ok } from '@/utils/api'
 import { rethrowDbConflict } from '@/utils/err'
 import { validateOrThrow } from '@/utils/validation'

backend/src/api/public/v1/members/identities/getMemberIdentities.ts

@@ -2,13 +2,9 @@ import type { Request, Response } from 'express'
 import { z } from 'zod'
 
 import { NotFoundError } from '@crowd/common'
-import {
-  MemberField,
-  fetchMemberIdentities,
-  findMemberById,
-  optionsQx,
-} from '@crowd/data-access-layer'
+import { MemberField, fetchMemberIdentities, findMemberById } from '@crowd/data-access-layer'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { ok } from '@/utils/api'
 import { validateOrThrow } from '@/utils/validation'
 

backend/src/api/public/v1/members/identities/verifyMemberIdentity.ts

@@ -18,7 +18,6 @@ import {
   deleteMemberIdentity,
   findMemberById,
   findMemberIdentityById,
-  optionsQx,
   queryActivityRelations,
   updateMemberIdentity,
 } from '@crowd/data-access-layer'
@@ -30,6 +29,7 @@ import {
   MemberUnmergeResult,
 } from '@crowd/types'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { noContent, ok } from '@/utils/api'
 import { rethrowDbConflict } from '@/utils/err'
 import { validateOrThrow } from '@/utils/validation'

backend/src/api/public/v1/members/maintainer-roles/getMemberMaintainerRoles.ts

@@ -2,13 +2,9 @@ import type { Request, Response } from 'express'
 import { z } from 'zod'
 
 import { NotFoundError } from '@crowd/common'
-import {
-  MemberField,
-  findMaintainerRoles,
-  findMemberById,
-  optionsQx,
-} from '@crowd/data-access-layer'
+import { MemberField, findMaintainerRoles, findMemberById } from '@crowd/data-access-layer'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { ok } from '@/utils/api'
 import { validateOrThrow } from '@/utils/validation'
 

backend/src/api/public/v1/members/project-affiliations/getProjectAffiliations.ts

@@ -9,9 +9,9 @@ import {
   fetchMemberWorkExperienceAffiliations,
   findMaintainerRoles,
   findMemberById,
-  optionsQx,
 } from '@crowd/data-access-layer'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { ok } from '@/utils/api'
 import { validateOrThrow } from '@/utils/validation'
 

backend/src/api/public/v1/members/project-affiliations/patchProjectAffiliation.ts

@@ -11,11 +11,11 @@ import {
   findMaintainerRoles,
   findMemberById,
   insertMemberSegmentAffiliations,
-  optionsQx,
 } from '@crowd/data-access-layer'
 import type { ISegmentAffiliationWithOrg } from '@crowd/data-access-layer'
 import { deleteMemberSegmentAffiliations } from '@crowd/data-access-layer/src/member_segment_affiliations'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { ok } from '@/utils/api'
 import { validateOrThrow } from '@/utils/validation'
 

backend/src/api/public/v1/members/resolveMember.ts

@@ -2,9 +2,10 @@ import type { Request, Response } from 'express'
 import { z } from 'zod'
 
 import { ConflictError, NotFoundError } from '@crowd/common'
-import { findMemberIdsByIdentities, optionsQx } from '@crowd/data-access-layer'
+import { findMemberIdsByIdentities } from '@crowd/data-access-layer'
 import { IMemberIdentity, MemberIdentityType, PlatformType } from '@crowd/types'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { ok } from '@/utils/api'
 import { validateOrThrow } from '@/utils/validation'
 

backend/src/api/public/v1/members/work-experiences/createMemberWorkExperience.ts

@@ -17,7 +17,6 @@ import {
   fetchManyMemberOrgsWithOrgData,
   fetchManyOrganizationAffiliationPolicies,
   findMemberById,
-  optionsQx,
 } from '@crowd/data-access-layer'
 import { deleteMemberSegmentAffiliations } from '@crowd/data-access-layer/src/member_segment_affiliations'
 import type {
@@ -26,6 +25,7 @@ import type {
   MemberOrganizationDateRange,
 } from '@crowd/types'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { created } from '@/utils/api'
 import { toMemberWorkExperience } from '@/utils/mapper'
 import { validateOrThrow } from '@/utils/validation'

backend/src/api/public/v1/members/work-experiences/deleteMemberWorkExperience.ts

@@ -9,9 +9,9 @@ import {
   deleteMemberOrganizations,
   fetchMemberOrganizations,
   findMemberById,
-  optionsQx,
 } from '@crowd/data-access-layer'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { noContent } from '@/utils/api'
 import { getOverlappingGroupedMemberOrganizations } from '@/utils/mapper'
 import { validateOrThrow } from '@/utils/validation'

backend/src/api/public/v1/members/work-experiences/getMemberWorkExperiences.ts

@@ -6,9 +6,9 @@ import {
   MemberField,
   fetchManyMemberOrgsWithOrgData,
   findMemberById,
-  optionsQx,
 } from '@crowd/data-access-layer'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { ok } from '@/utils/api'
 import { groupMemberOrganizations, toMemberWorkExperience } from '@/utils/mapper'
 import { validateOrThrow } from '@/utils/validation'

backend/src/api/public/v1/members/work-experiences/updateMemberWorkExperience.ts

@@ -16,7 +16,6 @@ import {
   fetchManyMemberOrgsWithOrgData,
   fetchMemberOrganizations,
   findMemberById,
-  optionsQx,
   updateMemberOrganization,
 } from '@crowd/data-access-layer'
 import type {
@@ -25,6 +24,7 @@ import type {
   MemberOrganizationUpdate,
 } from '@crowd/types'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { ok } from '@/utils/api'
 import {
   getOverlappingGroupedMemberOrganizations,

backend/src/api/public/v1/members/work-experiences/verifyMemberWorkExperience.ts

@@ -10,11 +10,11 @@ import {
   fetchManyMemberOrgsWithOrgData,
   fetchMemberOrganizations,
   findMemberById,
-  optionsQx,
   updateMemberOrganization,
 } from '@crowd/data-access-layer'
 import { IMemberOrganization, IMemberRoleWithOrganization } from '@crowd/types'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { ok } from '@/utils/api'
 import {
   getOverlappingGroupedMemberOrganizations,

backend/src/api/public/v1/organizations/createOrganization.ts

@@ -3,9 +3,10 @@ import { z } from 'zod'
 
 import { captureApiChange, organizationCreateAction } from '@crowd/audit-logs'
 import { BadRequestError, InternalError, normalizeHostname } from '@crowd/common'
-import { findOrCreateOrganization, optionsQx } from '@crowd/data-access-layer'
+import { findOrCreateOrganization } from '@crowd/data-access-layer'
 import { OrganizationAttributeSource, OrganizationIdentityType } from '@crowd/types'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { created } from '@/utils/api'
 import { validateOrThrow } from '@/utils/validation'
 

backend/src/api/public/v1/organizations/getOrganization.ts

@@ -2,8 +2,9 @@ import type { Request, Response } from 'express'
 import { z } from 'zod'
 
 import { BadRequestError, NotFoundError, normalizeHostname } from '@crowd/common'
-import { findOrganizationByNameOrDomain, optionsQx } from '@crowd/data-access-layer'
+import { findOrganizationByNameOrDomain } from '@crowd/data-access-layer'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import { ok } from '@/utils/api'
 import { validateOrThrow } from '@/utils/validation'
 

backend/src/bin/scripts/merge-members.ts

@@ -5,10 +5,11 @@ import path from 'path'
 
 import { generateUUIDv1 } from '@crowd/common'
 import { CommonMemberService } from '@crowd/common_services'
-import { optionsQx } from '@crowd/data-access-layer'
 import { MemberField, findMemberById } from '@crowd/data-access-layer/src/members'
 import { getServiceLogger } from '@crowd/logging'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
+
 import SequelizeRepository from '../../database/repositories/sequelizeRepository'
 
 /* eslint-disable no-console */

backend/src/bin/scripts/merge-similar-organizations.ts

@@ -4,11 +4,11 @@ import * as fs from 'fs'
 import path from 'path'
 import { QueryTypes } from 'sequelize'
 
-import { optionsQx } from '@crowd/data-access-layer'
 import { addMergeAction, setMergeAction } from '@crowd/data-access-layer/src/mergeActions/repo'
 import { MergeActionState, MergeActionType } from '@crowd/types'
 
 import { IRepositoryOptions } from '@/database/repositories/IRepositoryOptions'
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import getUserContext from '@/database/utils/getUserContext'
 import OrganizationService from '@/services/organizationService'
 import TenantService from '@/services/tenantService'

backend/src/database/repositories/memberRepository.ts

@@ -50,7 +50,6 @@ import {
   includeMemberToSegments,
 } from '@crowd/data-access-layer/src/members/segments'
 import { IDbMemberData } from '@crowd/data-access-layer/src/members/types'
-import { optionsBgQx, optionsQx } from '@crowd/data-access-layer/src/queryExecutor'
 import {
   fetchManySegments,
   getSegmentMergeSuggestionCounts,
@@ -76,6 +75,7 @@ import {
 
 import { KUBE_MODE, SERVICE } from '@/conf'
 import { ServiceType } from '@/conf/configTypes'
+import { optionsBgQx, optionsQx } from '@/database/sequelizeQueryExecutor'
 import { IFetchMemberMergeSuggestionArgs, SimilarityScoreRange } from '@/types/mergeSuggestionTypes'
 
 import { PlatformIdentities } from '../../serverless/integrations/types/messageTypes'

backend/src/database/repositories/organizationRepository.ts

@@ -33,7 +33,6 @@ import {
   upsertOrgAttributes,
 } from '@crowd/data-access-layer/src/organizations'
 import { findAttribute } from '@crowd/data-access-layer/src/organizations/attributesConfig'
-import { optionsQx } from '@crowd/data-access-layer/src/queryExecutor'
 import {
   findSegmentById,
   getSegmentMergeSuggestionCounts,
@@ -49,6 +48,7 @@ import {
   SegmentData,
 } from '@crowd/types'
 
+import { optionsQx } from '@/database/sequelizeQueryExecutor'
 import {
   IFetchOrganizationMergeSuggestionArgs,
   SimilarityScoreRange,

backend/src/database/repositories/repositoryBase.ts

@@ -1,14 +1,11 @@
 /* eslint-disable class-methods-use-this,@typescript-eslint/no-unused-vars */
 import { Sequelize } from 'sequelize'
 
-import {
-  QueryExecutor,
-  SequelizeQueryExecutor,
-  TransactionalSequelizeQueryExecutor,
-  optionsQx,
-} from '@crowd/data-access-layer/src/queryExecutor'
+import { QueryExecutor } from '@crowd/data-access-layer/src/queryExecutor'
 import { PageData, SearchCriteria } from '@crowd/types'
 
+import { optionsQx } from '../sequelizeQueryExecutor'
+
 import { IRepositoryOptions } from './IRepositoryOptions'
 import SequelizeRepository from './sequelizeRepository'
 

backend/src/database/repositories/sequelizeRepository.ts

@@ -3,11 +3,7 @@ import { Sequelize, Transaction, UniqueConstraintError } from 'sequelize'
 
 import { Error400 } from '@crowd/common'
 import { DbConnection, getDbConnection } from '@crowd/data-access-layer/src/database'
-import {
-  QueryExecutor,
-  SequelizeQueryExecutor,
-  TransactionalSequelizeQueryExecutor,
-} from '@crowd/data-access-layer/src/queryExecutor'
+import { QueryExecutor } from '@crowd/data-access-layer/src/queryExecutor'
 import { getServiceLogger } from '@crowd/logging'
 import { getOpensearchClient } from '@crowd/opensearch'
 import { getRedisClient } from '@crowd/redis'
@@ -23,6 +19,10 @@ import {
 } from '../../conf'
 import { IServiceOptions } from '../../services/IServiceOptions'
 import { databaseInit } from '../databaseConnection'
+import {
+  SequelizeQueryExecutor,
+  TransactionalSequelizeQueryExecutor,
+} from '../sequelizeQueryExecutor'
 
 import { IRepositoryOptions } from './IRepositoryOptions'