Merge remote-tracking branch 'origin/main' into chore/update-pvtr-version

Signed-off-by: Joana Maia <jmaia@contractor.linuxfoundation.org>

Author: joanagmaia

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'