Merge branch 'main' into deprecate-questdb-CM-420

Author: themarolt

backend/src/services/integrationService.ts

@@ -902,13 +902,15 @@ export default class IntegrationService {
   }
 
   async mapGithubRepos(integrationId, mapping, fireOnboarding = true) {
+    this.options.log.info(`Mapping GitHub repos for integration ${integrationId}!`)
     const transaction = await SequelizeRepository.createTransaction(this.options)
 
     const txOptions = {
       ...this.options,
       transaction,
     }
     try {
+      this.options.log.info(`Updating GitHub repos mapping for integration ${integrationId}!`)
       await GithubReposRepository.updateMapping(integrationId, mapping, txOptions)
 
       // add the repos to the git integration
@@ -927,9 +929,11 @@ export default class IntegrationService {
       const collectionService = new CollectionService(txOptions)
 
       for (const [segmentId, repositories] of Object.entries(repos)) {
+        this.options.log.info(`Finding insights project for segment ${segmentId}!`)
         const [insightsProject] = await collectionService.findInsightsProjectsBySegmentId(segmentId)
 
         if (insightsProject) {
+          this.options.log.info(`Upserting segment repositories for segment ${segmentId}!`)
           await upsertSegmentRepositories(qx, {
             insightsProjectId: insightsProject.id,
             repositories,
@@ -945,7 +949,7 @@ export default class IntegrationService {
       for (const [segmentId, urls] of Object.entries(repos)) {
         let isGitintegrationConfigured
         const segmentOptions: IRepositoryOptions = {
-          ...this.options,
+          ...txOptions,
           currentSegments: [
             {
               ...this.options.currentSegments[0],
@@ -954,6 +958,7 @@ export default class IntegrationService {
           ],
         }
         try {
+          this.options.log.info(`Finding Git integration for segment ${segmentId}!`)
           await IntegrationRepository.findByPlatform(PlatformType.GIT, segmentOptions)
 
           isGitintegrationConfigured = true
@@ -962,15 +967,18 @@ export default class IntegrationService {
         }
 
         if (isGitintegrationConfigured) {
+          this.options.log.info(`Finding Git integration for segment ${segmentId}!`)
           const gitInfo = await this.gitGetRemotes(segmentOptions)
           const gitRemotes = gitInfo[segmentId as string].remotes
+          this.options.log.info(`Updating Git integration for segment ${segmentId}!`)
           await this.gitConnectOrUpdate(
             {
               remotes: Array.from(new Set([...gitRemotes, ...urls])),
             },
             segmentOptions,
           )
         } else {
+          this.options.log.info(`Updating Git integration for segment ${segmentId}!`)
           await this.gitConnectOrUpdate(
             {
               remotes: urls,
@@ -981,6 +989,7 @@ export default class IntegrationService {
       }
 
       if (fireOnboarding) {
+        this.options.log.info('Updating integration status to in-progress!')
         const integration = await IntegrationRepository.update(
           integrationId,
           { status: 'in-progress' },
@@ -994,7 +1003,12 @@ export default class IntegrationService {
 
       await SequelizeRepository.commitTransaction(transaction)
     } catch (err) {
-      await SequelizeRepository.rollbackTransaction(transaction)
+      this.options.log.error(err, 'Error while mapping GitHub repos!')
+      try {
+        await SequelizeRepository.rollbackTransaction(transaction)
+      } catch (rErr) {
+        this.options.log.error(rErr, 'Error while rolling back transaction!')
+      }
       throw err
     }
   }
@@ -1266,7 +1280,9 @@ export default class IntegrationService {
       return null
     }
 
-    const transaction = await SequelizeRepository.createTransaction(options || this.options)
+    const existingTransaction = SequelizeRepository.getTransaction(options || this.options)
+    const transaction =
+      existingTransaction || (await SequelizeRepository.createTransaction(options || this.options))
     let integration
 
     try {
@@ -1291,9 +1307,15 @@ export default class IntegrationService {
         // inheritFromExistingRepos defaults to true during migration until all repos are migrated then git.repositories can be used as source of truth instead of existing repo tables
       )
 
-      await SequelizeRepository.commitTransaction(transaction)
+      // Only commit if we created the transaction ourselves
+      if (!existingTransaction) {
+        await SequelizeRepository.commitTransaction(transaction)
+      }
     } catch (err) {
-      await SequelizeRepository.rollbackTransaction(transaction)
+      // Only rollback if we created the transaction ourselves
+      if (!existingTransaction) {
+        await SequelizeRepository.rollbackTransaction(transaction)
+      }
       this.options.log.error(`gitConnectOrUpdate failed with error: ${err}`)
       throw err
     }

frontend/src/modules/activity/components/activity-timeline.vue

@@ -311,19 +311,24 @@ const fetchActivities = async ({ reset } = { reset: false }) => {
   if (loading.value) {
     return;
   }
-  const filterToApply = {
-    platform: platform.value ? { in: [platform.value] } : undefined,
-  };
 
-  if (props.entityType === 'member') {
-    filterToApply.memberId = { in: [props.entity.id] };
-  } else {
-    filterToApply.organizationId = { in: [props.entity.id] };
-  }
+  // Default filter to apply
+  const filterToApply: {
+    and: any[];
+  } = {
+    and: [
+      {
+        timestamp: {
+          gte: timestamp.value,
+        },
+      },
+    ],
+  };
 
-  if (props.entity.id) {
-    if (query.value && query.value !== '') {
-      filterToApply.or = [
+  // Add search query filter to and clause
+  if (props.entity.id && !!query.value) {
+    filterToApply.and.push({
+      or: [
         {
           channel: {
             textContains: query.value,
@@ -334,17 +339,27 @@ const fetchActivities = async ({ reset } = { reset: false }) => {
             textContains: query.value,
           },
         },
-      ];
-    }
+      ],
+    });
   }
 
-  filterToApply.and = [
-    {
-      timestamp: {
-        gte: timestamp.value,
-      },
-    },
-  ];
+  // Add platform filter to and clause
+  if (platform.value) {
+    filterToApply.and.push({
+      platform: { in: [platform.value] },
+    });
+  }
+
+  // Add entity filter to and clause
+  if (props.entityType === 'member') {
+    filterToApply.and.push({
+      memberId: { in: [props.entity.id] },
+    });
+  } else {
+    filterToApply.and.push({
+      organizationId: { in: [props.entity.id] },
+    });
+  }
 
   if (reset) {
     activities.value.length = 0;

frontend/src/modules/admin/modules/insights-projects/components/lf-insights-project-add.vue

@@ -286,7 +286,6 @@ const onSubmit = () => {
   const request = buildRequest({
     ...form,
   });
-  console.log(request);
   if (isEditForm.value) {
     updateMutation.mutate({
       id: props.insightsProjectId as string,

frontend/src/modules/admin/modules/insights-projects/pages/insights-projects.page.vue

@@ -197,7 +197,6 @@ const projects = computed((): InsightsProjectModel[] => {
 });
 
 watch(() => route.query, (query) => {
-  console.log('query', query);
   if (query?.search !== search.value) {
     search.value = query.search as string || '';
   }
@@ -207,7 +206,6 @@ watch(() => route.query, (query) => {
 
 watch(search, (value) => {
   if (value !== route.query?.search) {
-    console.log('search', value);
     router.replace({
       query: {
         ...route.query,

frontend/src/modules/admin/modules/insights-projects/services/insights-projects.service.ts

@@ -37,7 +37,6 @@ export class InsightsProjectsService {
   }
 
   update(id: string, project: InsightsProjectRequest) {
-    console.log(project);
     return authAxios
       .post<InsightsProjectModel>(
         `/collections/insights-projects/${id}`,

frontend/src/shared/form/autocomplete-one-input.vue

@@ -188,15 +188,12 @@ export default {
 
   methods: {
     async onChange(value) {
-      const { query } = this.$refs.input;
-
       if (
-        typeof query === 'string'
-        && query !== ''
+        this.currentQuery !== ''
         && this.createIfNotFound
         && !value
       ) {
-        const newItem = await this.createFn(query);
+        const newItem = await this.createFn(this.currentQuery);
         this.localOptions.push(newItem);
         this.$emit('update:modelValue', newItem);
       } else {

services/libs/common_services/src/services/llm.service.ts

@@ -36,13 +36,22 @@ export class LlmService extends LoggerBase {
   ) {
     super(parentLog)
 
+    if (!bedrockCredentials.accessKeyId || !bedrockCredentials.secretAccessKey) {
+      this.log.warn('LLM usage is not configured properly. Missing Bedrock credentials!')
+    }
+
     this.qx = qx
     this.clientRegionMap = new Map()
   }
 
   private client(settings: ILlmSettings): BedrockRuntimeClient {
     const region = LLM_MODEL_REGION_MAP[settings.modelId]
 
+    if (!this.bedrockCredentials.accessKeyId || !this.bedrockCredentials.secretAccessKey) {
+      this.log.warn('LLM usage is not configured properly. Missing Bedrock credentials!')
+      return null
+    }
+
     let client: BedrockRuntimeClient
     if (this.clientRegionMap.has(region)) {
       client = this.clientRegionMap.get(region)
@@ -67,7 +76,11 @@ export class LlmService extends LoggerBase {
     metadata?: Record<string, unknown>,
     saveHistory = true,
   ): Promise<ILlmResponse> {
-    if (!IS_LLM_ENABLED) {
+    if (
+      !IS_LLM_ENABLED ||
+      !this.bedrockCredentials.accessKeyId ||
+      !this.bedrockCredentials.secretAccessKey
+    ) {
       this.log.error('LLM usage is disabled. Check CROWD_LLM_ENABLED env variable!')
       return
     }
@@ -158,6 +171,12 @@ export class LlmService extends LoggerBase {
   ): Promise<ILlmResult<LlmMemberEnrichmentResult>> {
     const response = await this.queryLlm(LlmQueryType.MEMBER_ENRICHMENT, prompt, memberId)
 
+    if (!response) {
+      return {
+        result: null,
+      } as ILlmResult<LlmMemberEnrichmentResult>
+    }
+
     const result = JSON.parse(response.answer)
 
     return {
@@ -175,6 +194,12 @@ export class LlmService extends LoggerBase {
       memberId,
     )
 
+    if (!response) {
+      return {
+        result: null,
+      } as ILlmResult<{ profileIndex: number }>
+    }
+
     const result = JSON.parse(response.answer)
 
     return {
@@ -193,6 +218,12 @@ export class LlmService extends LoggerBase {
       memberId,
     )
 
+    if (!response) {
+      return {
+        result: null,
+      } as ILlmResult<T>
+    }
+
     const result = JSON.parse(response.answer)
 
     return {
@@ -211,6 +242,12 @@ export class LlmService extends LoggerBase {
       memberId,
     )
 
+    if (!response) {
+      return {
+        result: null,
+      } as ILlmResult<T>
+    }
+
     const result = JSON.parse(response.answer)
 
     return {
@@ -225,6 +262,12 @@ export class LlmService extends LoggerBase {
       prompt,
     )
 
+    if (!response) {
+      return {
+        result: null,
+      } as ILlmResult<T>
+    }
+
     const result = JSON.parse(response.answer)
 
     return {
@@ -236,6 +279,12 @@ export class LlmService extends LoggerBase {
   public async findRepoCategories<T>(prompt: string): Promise<ILlmResult<T>> {
     const response = await this.queryLlm(LlmQueryType.REPO_CATEGORIES, prompt)
 
+    if (!response) {
+      return {
+        result: null,
+      } as ILlmResult<T>
+    }
+
     const result = JSON.parse(response.answer)
 
     return {
@@ -247,6 +296,12 @@ export class LlmService extends LoggerBase {
   public async findRepoCollections<T>(prompt: string): Promise<ILlmResult<T>> {
     const response = await this.queryLlm(LlmQueryType.REPO_COLLECTIONS, prompt)
 
+    if (!response) {
+      return {
+        result: null,
+      } as ILlmResult<T>
+    }
+
     const result = JSON.parse(response.answer)
 
     return {

services/libs/data-access-layer/src/members/organizations.ts

@@ -245,9 +245,23 @@ export async function deleteMemberOrganizations(
     params.ids = ids
   }
 
-  const query = `${baseQuery} WHERE ${conditions.join(' AND ')};`
+  const whereClause = conditions.join(' AND ')
+  const query = `${baseQuery} WHERE ${whereClause};`
 
-  await qx.result(query, params)
+  await qx.tx(async (tx) => {
+    // First delete from memberOrganizationAffiliationOverrides using the same conditions
+    await tx.result(
+      `DELETE FROM "memberOrganizationAffiliationOverrides" 
+       WHERE "memberOrganizationId" IN (
+         SELECT "id" FROM "memberOrganizations" 
+         WHERE ${whereClause}
+       )`,
+      params,
+    )
+
+    // Then perform the soft/hard delete on memberOrganizations
+    await tx.result(query, params)
+  })
 }
 
 export async function cleanSoftDeletedMemberOrganization(