Activities with organizations by epipav · Pull Request #968 · linuxfoundation/crowd.dev

epipav · 2023-06-08T11:58:57Z

Changes proposed ✍️

Member enrichment improvement: We now also get member's organization and create the related entity on enrichment/
New relation between organizations & activities using the new organizationId field in activities.
Members can now have their distinct affiliation settings. Affiliation is an override setting for a member's activities for the organization. Since members can have multiple organizations, for each member we can let users select which organization will be associated with their activities.
Member-segment affiliation settings can be manipulated by updating the member. The field is called affiliations and it has the form of:

{
    memberId: uuid
    segmentId: uuid
    organizationId: uuid
}

While we return this along with the member, we also include additional join attributes for segment and organization (organizationName, organizationLogo, segmentParentName, segmentName, segmentSlug)

If an affiliation setting isn't present for a member, we select the first organization of the member and associate it with their activities.
Activity organization is set on activity creation - Subsequent upserts to the activity will not change its organization.

What

`🤖 Generated by Copilot at d394665`

This pull request adds and improves features related to activity and member data, organization information, and conversation settings. It updates the data models, repositories, services, and scripts to handle the new and modified fields and associations. It also refactors some code to use the format method and adds a new script to the data sink worker service.

`🤖 Generated by Copilot at d394665`

organizationId
joins activities and orgs
a winter project

Why

How

`🤖 Generated by Copilot at d394665`

Drop and add back organizationId column to activities table with foreign key constraint (link, link)
Add belongsTo association between activity and organization models (link)
Include organizationId and organization model in activity repository methods (link, link, link)
Add script to generate parentIds for historical discord activities (link)
Add body property to message object sent to SQS queue by sendNodeWorkerMessage function (link)
Add logic to create organization object from enrichment data in memberEnrichmentService (link)
Add companyUrl and company properties to enrichment interfaces (link, link)
Modify awards attribute type from MULTI_SELECT to SPECIAL in sampleDataService (link)
Add script to restart a specific result by id in data_sink_worker service (link)
Refactor updateActivity and updateMember methods in data_sink_worker repo to use format method (link, link)
Modify insert query for conversationSettings table to include createdById column (link)
Refactor toDb and add format methods in repository base class (link, link)
Add null check for sentiment property of activity in memberRepository (link)

Checklist ✅

Label appropriately with Feature, Improvement, or Bug.
Add screehshots to the PR description for relevant FE changes
New backend functionality has been unit-tested.
API documentation has been updated (if necessary) (see docs on API documentation).
Quality standards are met.

…tion

…iliations into a new table

…tion

…wdDotDev/crowd.dev into feature/activities-with-organization

…tion

sausage-todd

Looks great, but clarify a couple comments please before we merge

sausage-todd · 2023-06-13T09:04:13Z


    const currentTenant = SequelizeRepository.getCurrentTenant(options)

+    const segment = SequelizeRepository.getStrictlySingleActiveSegment(options)


sausage-todd · 2023-06-13T09:07:38Z

+        include: [
+          {
+            model: options.database.segment,
+            as: 'segments',
+            through: {
+              attributes: [],
+            },
+          },
+        ],


Activities have their own segments, right? If you need segments in the returned data, why not include segments just by themselves on the top level?

we don't need the include at all anymore, I was first keeping the affiliation settings in memberSegments then changed to a new table, this was some artifact from it. Thanks for spotting it 👍 removed the include

sausage-todd · 2023-06-13T09:11:14Z

+UPDATE activities
+SET "organizationId" = (
+    SELECT mo."organizationId"
+    FROM "memberOrganizations" AS mo
+    WHERE mo."memberId" = activities."memberId"
+    ORDER BY mo."createdAt" DESC
+    LIMIT 1
+);


This doesn't look right. Shouldn't we also filter by tenantId, and maybe segmentId ?

tenantId filter is already implicitly in memberId since each member can belong to only one tenant -
I didn't include segments because, in the prod data, we don't have segments yet. Tho probably it'll be better to add it for the staging data - I updated the query to also join by organizationSegments 👍

sausage-todd · 2023-06-13T09:12:20Z

@@ -0,0 +1 @@
+ALTER TABLE public."activities" DROP COLUMN "organizationId"


DROP TABLE "memberSegmentAffiliations" ?

sausage-todd · 2023-06-13T09:14:36Z

+export function switchSegments(options, segments) {
+  options.currentSegments = segments
+}


sausage-todd · 2023-06-13T09:15:40Z

+    const parent = await segmentRepository.findBySlug(data.parentSlug, SegmentLevel.PROJECT)
+
+    if (parent === null) {
+      throw new Error(`Project ${data.parentSlug} does not exist.`)
+    }
+
+    const grandparent = await segmentRepository.findBySlug(
+      data.grandparentSlug,
+      SegmentLevel.PROJECT_GROUP,
+    )
+
+    if (grandparent === null) {
+      throw new Error(`Project group ${data.parentSlug} does not exist.`)
+    }
+


…rs by activity segment

…tion

epipav added 7 commits June 7, 2023 23:25

member enrichment also enriches member organizations

261c199

activity organizations for historical data, repo layer

ed2948f

Merge branch 'feature/segments' into feature/activities-with-organiza…

d394665

…tion

memberSegments migrations for affilated organizations

f3f3651

activity update using only single segment, refactor memberSegmentAff…

367c26b

…iliations into a new table

createWithMember with activity organizations and member affiliations

c542162

Merge branch 'feature/segments' into feature/activities-with-organiza…

31b56b7

…tion

epipav self-assigned this Jun 12, 2023

epipav added the Feature Created by Linear-GitHub Sync label Jun 12, 2023

epipav marked this pull request as ready for review June 12, 2023 10:57

epipav added 9 commits June 12, 2023 12:58

comments update

73db8b7

Merge branch 'feature/segments' into feature/activities-with-organiza…

cbe768d

…tion

Merge branch 'feature/activities-with-organization' of github.com:Cro…

3699d97

…wdDotDev/crowd.dev into feature/activities-with-organization

fix linter, formatting

9c29095

Merge branch 'feature/segments' into feature/activities-with-organiza…

8486b2a

…tion

tests are passing

09868ce

tests for member affiliation settings and activity organizations

7aa3105

test data payloads simplified

b996b1d

formatting

d4ee127

epipav requested a review from sausage-todd June 13, 2023 08:33

sausage-todd reviewed Jun 13, 2023

View reviewed changes

segments excluded from activity members, historical update also filte…

9ff83e2

…rs by activity segment

sausage-todd approved these changes Jun 14, 2023

View reviewed changes

epipav and others added 2 commits June 14, 2023 12:14

conversation activities also return organizations

b43c3bd

Merge branch 'feature/segments' into feature/activities-with-organiza…

a3615f6

…tion

joanagmaia merged commit e424cc9 into feature/segments Jun 19, 2023

joanagmaia deleted the feature/activities-with-organization branch June 19, 2023 17:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Activities with organizations#968

Activities with organizations#968
joanagmaia merged 19 commits intofeature/segmentsfrom
feature/activities-with-organization

epipav commented Jun 8, 2023 •

edited

Loading

Uh oh!

sausage-todd left a comment

Uh oh!

sausage-todd Jun 13, 2023

Uh oh!

sausage-todd Jun 13, 2023

Uh oh!

epipav Jun 13, 2023 •

edited

Loading

Uh oh!

sausage-todd Jun 13, 2023

Uh oh!

epipav Jun 13, 2023 •

edited

Loading

Uh oh!

sausage-todd Jun 13, 2023

Uh oh!

epipav Jun 13, 2023

Uh oh!

sausage-todd Jun 13, 2023

Uh oh!

sausage-todd Jun 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants


		const currentTenant = SequelizeRepository.getCurrentTenant(options)

		const segment = SequelizeRepository.getStrictlySingleActiveSegment(options)

		@@ -0,0 +1 @@
		ALTER TABLE public."activities" DROP COLUMN "organizationId" No newline at end of file

Conversation

epipav commented Jun 8, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes proposed ✍️

What

🤖 Generated by Copilot at d394665

🤖 Generated by Copilot at d394665

Why

How

🤖 Generated by Copilot at d394665

Checklist ✅

Uh oh!

sausage-todd left a comment

Choose a reason for hiding this comment

Uh oh!

sausage-todd Jun 13, 2023

Choose a reason for hiding this comment

Uh oh!

sausage-todd Jun 13, 2023

Choose a reason for hiding this comment

Uh oh!

epipav Jun 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sausage-todd Jun 13, 2023

Choose a reason for hiding this comment

Uh oh!

epipav Jun 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sausage-todd Jun 13, 2023

Choose a reason for hiding this comment

Uh oh!

epipav Jun 13, 2023

Choose a reason for hiding this comment

Uh oh!

sausage-todd Jun 13, 2023

Choose a reason for hiding this comment

Uh oh!

sausage-todd Jun 13, 2023

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

epipav commented Jun 8, 2023 •

edited

Loading

`🤖 Generated by Copilot at d394665`

`🤖 Generated by Copilot at d394665`

`🤖 Generated by Copilot at d394665`

epipav Jun 13, 2023 •

edited

Loading

epipav Jun 13, 2023 •

edited

Loading