From 191fc6eab84533f198618cb3e53e2a5a1e0bf590 Mon Sep 17 00:00:00 2001
From: Joan Reyero <joan@crowd.dev>
Date: Tue, 15 Aug 2023 11:45:38 +0100
Subject: [PATCH 1/8] Activity count > 0

---
 .../config/saved-views/views/all-organizations.ts             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/modules/organization/config/saved-views/views/all-organizations.ts b/frontend/src/modules/organization/config/saved-views/views/all-organizations.ts
index f93dc6b9b4..5483b325e5 100644
--- a/frontend/src/modules/organization/config/saved-views/views/all-organizations.ts
+++ b/frontend/src/modules/organization/config/saved-views/views/all-organizations.ts
@@ -12,6 +12,10 @@ const allOrganizations: SavedView = {
     },
     settings: {
       teamOrganization: 'exclude',
+      noOfActivities: {
+        operator: 'gt',
+        value: 0,
+      },
     },
   },
 };

From 9264a583b75898055394bb26328f701d40bbb14a Mon Sep 17 00:00:00 2001
From: Joan Reyero <joan@crowd.dev>
Date: Tue, 15 Aug 2023 13:20:27 +0100
Subject: [PATCH 2/8] Description

---
 .../organization/components/list/organization-list-table.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/modules/organization/components/list/organization-list-table.vue b/frontend/src/modules/organization/components/list/organization-list-table.vue
index ce2d3b54d5..8a579e93c6 100644
--- a/frontend/src/modules/organization/components/list/organization-list-table.vue
+++ b/frontend/src/modules/organization/components/list/organization-list-table.vue
@@ -135,7 +135,7 @@
                         v-if="scope.row.headline"
                         class="text-sm h-full flex items-center text-gray-900"
                       >
-                        {{ scope.row.headline }}
+                        {{ scope.row.headline || scope.row.description }}
                       </span>
                       <span
                         v-else

From c90b971a8acde217e6d542b7f5ee761fa1c5ccb1 Mon Sep 17 00:00:00 2001
From: Joan Reyero <joan@crowd.dev>
Date: Tue, 15 Aug 2023 15:01:48 +0100
Subject: [PATCH 3/8] Test organizations

---
 .../repositories/organizationRepository.ts    | 28 +++++++++++--------
 .../saved-views/views/all-organizations.ts    |  4 ---
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/backend/src/database/repositories/organizationRepository.ts b/backend/src/database/repositories/organizationRepository.ts
index 11824b9228..32f7742a0d 100644
--- a/backend/src/database/repositories/organizationRepository.ts
+++ b/backend/src/database/repositories/organizationRepository.ts
@@ -375,11 +375,10 @@ class OrganizationRepository {
       `
           WITH
               activity_counts AS (
-                  SELECT mo."organizationId", COUNT(a.id) AS "activityCount"
-                  FROM "memberOrganizations" mo
-                  LEFT JOIN activities a ON a."memberId" = mo."memberId"
-                  WHERE mo."organizationId" = :id
-                  GROUP BY mo."organizationId"
+                SELECT "organizationId", COUNT(id) AS "activityCount"
+                FROM activities
+                WHERE "organizationId" = :id
+                GROUP BY "organizationId"
               ),
               member_counts AS (
                   SELECT "organizationId", COUNT(DISTINCT "memberId") AS "memberCount"
@@ -388,12 +387,11 @@ class OrganizationRepository {
                   GROUP BY "organizationId"
               ),
               active_on AS (
-                  SELECT mo."organizationId", ARRAY_AGG(DISTINCT platform) AS "activeOn"
-                  FROM "memberOrganizations" mo
-                  JOIN activities a ON a."memberId" = mo."memberId"
-                  WHERE mo."organizationId" = :id
-                  GROUP BY mo."organizationId"
-              ),
+                SELECT "organizationId", ARRAY_AGG(DISTINCT platform) AS "activeOn"
+                FROM activities
+                WHERE "organizationId" = :id
+                GROUP BY "organizationId"
+            ),
               identities AS (
                   SELECT "organizationId", ARRAY_AGG(DISTINCT platform) AS "identities"
                   FROM "memberOrganizations" mo
@@ -600,6 +598,14 @@ class OrganizationRepository {
 
     const translator = FieldTranslatorFactory.getTranslator(OpenSearchIndex.ORGANIZATIONS)
 
+    if (filter.and) {
+      filter.and.push({
+        activityCount: {
+          gt: 0
+        }
+      })
+    }
+
     const parsed = OpensearchQueryParser.parse(
       { filter, limit, offset, orderBy },
       OpenSearchIndex.ORGANIZATIONS,
diff --git a/frontend/src/modules/organization/config/saved-views/views/all-organizations.ts b/frontend/src/modules/organization/config/saved-views/views/all-organizations.ts
index 5483b325e5..f93dc6b9b4 100644
--- a/frontend/src/modules/organization/config/saved-views/views/all-organizations.ts
+++ b/frontend/src/modules/organization/config/saved-views/views/all-organizations.ts
@@ -12,10 +12,6 @@ const allOrganizations: SavedView = {
     },
     settings: {
       teamOrganization: 'exclude',
-      noOfActivities: {
-        operator: 'gt',
-        value: 0,
-      },
     },
   },
 };

From e63bd75791f36cbf2e135f9d26e4a34b97259603 Mon Sep 17 00:00:00 2001
From: Joan Reyero <joan@crowd.dev>
Date: Tue, 15 Aug 2023 15:27:39 +0100
Subject: [PATCH 4/8] Remove sorts

---
 .../organization/components/list/organization-list-table.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/src/modules/organization/components/list/organization-list-table.vue b/frontend/src/modules/organization/components/list/organization-list-table.vue
index 8a579e93c6..eadab84d10 100644
--- a/frontend/src/modules/organization/components/list/organization-list-table.vue
+++ b/frontend/src/modules/organization/components/list/organization-list-table.vue
@@ -120,7 +120,6 @@
                 label="Headline"
                 prop="headline"
                 width="300"
-                sortable
               >
                 <template #default="scope">
                   <router-link
@@ -348,7 +347,6 @@
                 label="Location"
                 width="150"
                 prop="location"
-                sortable
               >
                 <template #default="scope">
                   <router-link
@@ -377,7 +375,6 @@
                 label="Industry"
                 width="150"
                 prop="industry"
-                sortable
               >
                 <template #default="scope">
                   <router-link
@@ -406,7 +403,6 @@
                 label="Headcount"
                 width="150"
                 prop="size"
-                sortable
               >
                 <template #default="scope">
                   <router-link
@@ -435,7 +431,6 @@
                 label="Type"
                 width="150"
                 prop="type"
-                sortable
               >
                 <template #default="scope">
                   <router-link

From 9d6eb0a68ac90c3d4c4d867f387fc306a7c52d29 Mon Sep 17 00:00:00 2001
From: Joan Reyero <joan@crowd.dev>
Date: Tue, 15 Aug 2023 16:29:04 +0100
Subject: [PATCH 5/8] Test

---
 .../components/list/organization-list-table.vue           | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/modules/organization/components/list/organization-list-table.vue b/frontend/src/modules/organization/components/list/organization-list-table.vue
index eadab84d10..636c5d61a6 100644
--- a/frontend/src/modules/organization/components/list/organization-list-table.vue
+++ b/frontend/src/modules/organization/components/list/organization-list-table.vue
@@ -134,7 +134,7 @@
                         v-if="scope.row.headline"
                         class="text-sm h-full flex items-center text-gray-900"
                       >
-                        {{ scope.row.headline || scope.row.description }}
+                        {{ headlineOrDescription(scope.row) }}
                       </span>
                       <span
                         v-else
@@ -592,6 +592,12 @@ document.onmouseup = () => {
   isCursorDown.value = false;
 };
 
+function headlineOrDescription(row) {
+  console.log('headline', row.headline)
+  console.log('description', row.description)
+  return row.headline
+}
+
 function doChangeSort(sorter) {
   filters.value.order = {
     prop: sorter.prop,

From 9204e7cc4c5a5dfe4e87d352a1b3c32342653868 Mon Sep 17 00:00:00 2001
From: Joan Reyero <joan@crowd.dev>
Date: Tue, 15 Aug 2023 16:34:48 +0100
Subject: [PATCH 6/8] Now

---
 .../components/list/organization-list-table.vue        | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/frontend/src/modules/organization/components/list/organization-list-table.vue b/frontend/src/modules/organization/components/list/organization-list-table.vue
index 636c5d61a6..2e0788f1bb 100644
--- a/frontend/src/modules/organization/components/list/organization-list-table.vue
+++ b/frontend/src/modules/organization/components/list/organization-list-table.vue
@@ -131,10 +131,10 @@
                   >
                     <div class="mr-4">
                       <span
-                        v-if="scope.row.headline"
+                        v-if="scope.row.headline || scope.row.description"
                         class="text-sm h-full flex items-center text-gray-900"
                       >
-                        {{ headlineOrDescription(scope.row) }}
+                        {{ scope.row.headline || scope.row.description }}
                       </span>
                       <span
                         v-else
@@ -592,12 +592,6 @@ document.onmouseup = () => {
   isCursorDown.value = false;
 };
 
-function headlineOrDescription(row) {
-  console.log('headline', row.headline)
-  console.log('description', row.description)
-  return row.headline
-}
-
 function doChangeSort(sorter) {
   filters.value.order = {
     prop: sorter.prop,

From 0b432f622342b5fb8f4f4d0af64ff6cef1bc0ea5 Mon Sep 17 00:00:00 2001
From: Joan Reyero <joan@crowd.dev>
Date: Tue, 15 Aug 2023 17:47:51 +0100
Subject: [PATCH 7/8] Format

---
 backend/src/database/repositories/organizationRepository.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/database/repositories/organizationRepository.ts b/backend/src/database/repositories/organizationRepository.ts
index 32f7742a0d..18ab59002e 100644
--- a/backend/src/database/repositories/organizationRepository.ts
+++ b/backend/src/database/repositories/organizationRepository.ts
@@ -601,8 +601,8 @@ class OrganizationRepository {
     if (filter.and) {
       filter.and.push({
         activityCount: {
-          gt: 0
-        }
+          gt: 0,
+        },
       })
     }
 

From efec8b323b4ac5957479bef6d62d98bcee8d97f1 Mon Sep 17 00:00:00 2001
From: Joan Reyero <joan@crowd.dev>
Date: Tue, 15 Aug 2023 18:12:46 +0100
Subject: [PATCH 8/8] Tests

---
 .../__tests__/organizationRepository.test.ts  | 182 ------------------
 1 file changed, 182 deletions(-)

diff --git a/backend/src/database/repositories/__tests__/organizationRepository.test.ts b/backend/src/database/repositories/__tests__/organizationRepository.test.ts
index 3a78c872df..4af2df2862 100644
--- a/backend/src/database/repositories/__tests__/organizationRepository.test.ts
+++ b/backend/src/database/repositories/__tests__/organizationRepository.test.ts
@@ -905,68 +905,6 @@ describe('OrganizationRepository tests', () => {
       expect(found.rows[0].name).toBe('crowd.dev')
     })
 
-    it('Should filter by activityCount', async () => {
-      const mockIRepositoryOptions = await SequelizeTestUtils.getTestIRepositoryOptions(db)
-      const org1 = await createOrganization(crowddev, mockIRepositoryOptions, [
-        {
-          username: {
-            github: {
-              username: 'joan',
-              integrationId: generateUUIDv1(),
-            },
-          },
-          displayName: 'Joan',
-          joinedAt: moment().toDate(),
-          activities: [
-            {
-              type: 'activity',
-              username: 'joan',
-              timestamp: '2020-05-27T15:13:30Z',
-              platform: PlatformType.GITHUB,
-              sourceId: '#sourceId1',
-            },
-          ],
-        },
-        {
-          username: {
-            github: {
-              username: 'anil',
-              integrationId: generateUUIDv1(),
-            },
-          },
-          displayName: 'anil',
-          joinedAt: moment().toDate(),
-          activities: [
-            {
-              type: 'activity',
-              username: 'anil',
-              timestamp: '2020-06-27T15:13:30Z',
-              platform: PlatformType.TWITTER,
-              sourceId: '#sourceId2',
-            },
-          ],
-        },
-      ])
-      await createOrganization(piedpiper, mockIRepositoryOptions)
-      await createOrganization(hooli, mockIRepositoryOptions)
-
-      const found = await OrganizationRepository.findAndCountAll(
-        {
-          advancedFilter: {
-            activityCount: {
-              gte: 2,
-            },
-          },
-        },
-        mockIRepositoryOptions,
-      )
-
-      delete org1.members
-
-      expect(found.count).toBe(1)
-      expect(found.rows).toStrictEqual([org1])
-    })
-
     it('Should filter by memberCount', async () => {
       const mockIRepositoryOptions = await SequelizeTestUtils.getTestIRepositoryOptions(db)
       const org1 = await createOrganization(crowddev, mockIRepositoryOptions, [
@@ -1046,126 +984,6 @@ describe('OrganizationRepository tests', () => {
       ])
     })
 
-    it('Should filter by joinedAt', async () => {
-      const mockIRepositoryOptions = await SequelizeTestUtils.getTestIRepositoryOptions(db)
-      await createOrganization(crowddev, mockIRepositoryOptions, [
-        {
-          username: {
-            github: {
-              username: 'joan',
-              integrationId: generateUUIDv1(),
-            },
-          },
-          displayName: 'Joan',
-          joinedAt: moment().toDate(),
-          activities: [
-            {
-              type: 'activity',
-              username: 'joan',
-              timestamp: '2020-05-27T15:13:30Z',
-              platform: PlatformType.GITHUB,
-              sourceId: '#sourceId1',
-            },
-          ],
-        },
-        {
-          username: {
-            github: {
-              username: 'anil',
-              integrationId: generateUUIDv1(),
-            },
-          },
-          displayName: 'anil',
-          joinedAt: moment().toDate(),
-          activities: [
-            {
-              username: 'anil',
-              type: 'activity',
-              timestamp: '2020-04-27T15:13:30Z',
-              platform: PlatformType.SLACK,
-              sourceId: '#sourceId2',
-            },
-          ],
-        },
-        {
-          username: {
-            github: {
-              username: 'uros',
-              integrationId: generateUUIDv1(),
-            },
-          },
-          displayName: 'uros',
-          joinedAt: moment().toDate(),
-          activities: [
-            {
-              type: 'activity',
-              username: 'uros',
-              timestamp: '2020-03-27T15:13:30Z',
-              platform: PlatformType.TWITTER,
-              sourceId: '#sourceId3',
-            },
-          ],
-        },
-      ])
-      const org2 = await createOrganization(piedpiper, mockIRepositoryOptions, [
-        {
-          username: {
-            github: {
-              username: 'mario',
-              integrationId: generateUUIDv1(),
-            },
-          },
-          displayName: 'mario',
-          joinedAt: moment().toDate(),
-          activities: [
-            {
-              type: 'activity',
-              username: 'mario',
-              timestamp: '2022-03-27T15:13:30Z',
-              platform: PlatformType.DEVTO,
-              sourceId: '#sourceId4',
-            },
-          ],
-        },
-        {
-          username: {
-            github: {
-              username: 'igor',
-              integrationId: generateUUIDv1(),
-            },
-          },
-          displayName: 'igor',
-          joinedAt: moment().toDate(),
-          activities: [
-            {
-              type: 'activity',
-              username: 'igor',
-              timestamp: '2022-02-27T15:13:30Z',
-              platform: PlatformType.DEVTO,
-              sourceId: '#sourceId5',
-            },
-          ],
-        },
-      ])
-      await createOrganization(hooli, mockIRepositoryOptions)
-
-      const found = await OrganizationRepository.findAndCountAll(
-        {
-          advancedFilter: {
-            joinedAt: {
-              gte: '2022-02-27',
-            },
-          },
-        },
-        mockIRepositoryOptions,
-      )
-
-      delete org2.members
-
-      expect(found.count).toBe(1)
-      expect(found.rows.sort((a, b) => (a.createdAt > b.createdAt ? 1 : -1))).toStrictEqual([org2])
-    })
-
     it('Should work with advanced filters', async () => {
       const mockIRepositoryOptions = await SequelizeTestUtils.getTestIRepositoryOptions(db)
       await createOrganization(crowddev, mockIRepositoryOptions, [