Skip to content

Python workers fixes after migrating to array type emails #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
epipav merged 2 commits into from
Mar 22, 2023
Merged

Python workers fixes after migrating to array type emails #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c09483
emails as arraysfor members score service
epipav Mar 22, 2023
806bf78
additional check for empty emails
epipav Mar 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/src/serverless/microservices/python/crowd-backend/crowd/backend/models/member.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from sqlalchemy import Column, String, DateTime, ForeignKey, Integer, Table
from sqlalchemy import Column, String, DateTime, ForeignKey, Integer, Table, ARRAY
from .base import Base
from sqlalchemy.orm import relationship, validates
from sqlalchemy.dialects.postgresql import JSONB, UUID
Expand Down Expand Up @@ -32,7 +32,7 @@ class Member(Base):
username = Column(JSONB, nullable=False)
displayName = Column(String, nullable=True)
attributes = Column(JSONB, default={})
email = Column(String)
emails = Column(ARRAY(String))
score = Column(Integer, default=-1)
joinedAt = Column(DateTime, nullable=False)
importHash = Column(String, nullable=True)
Expand Down
2 changes: 1 addition & 1 deletion backend/src/serverless/microservices/python/crowd-backend/crowd/backend/repository/keys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class DBKeys:
MEMBERS = "members"
MEMBER = "member"
SCORE = "score"
EMAIL = "email"
EMAILS = "emails"
TO_MERGE = "membersToMerge"
CROWD_USERNAME = "crowdUsername"
NO_MERGE = "noMerge"
Expand Down
2 changes: 1 addition & 1 deletion .../src/serverless/microservices/python/crowd-backend/crowd/backend/repository/repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def find_by_id(self, table, id):
def find_all_usernames(self):
with self.engine.connect() as con:
return con.execute(
f"""SELECT "id", "username", "displayName", "email" from "members" WHERE "tenantId" = '{self.tenant_id}'""").fetchall()
f"""SELECT "id", "username", "displayName", "emails" from "members" WHERE "tenantId" = '{self.tenant_id}'""").fetchall()

def find_all(
self, table, ignore_tenant: "bool" = False, query: "dict" = None, order: "dict" = None
Expand Down
8 changes: 4 additions & 4 deletions ...oservices/python/crowd-check-merge-members/crowd/check_merge_members/merge_suggestions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ def find_similar_member(self, member, comparison, same_platform=False):

member.username['displayNameMember1'] = member.displayName
members[i].username['displayNameMember2'] = members[i].displayName
if member.email:
member.username['email'] = member.email
if members[i].email:
members[i].username['email'] = members[i].email
if len(member.emails) > 0 and len(member.emails[0]) > 0:
member.username['email'] = member.emails[0]
if len(members[i].emails) > 0 and len(members[i].emails[0]) > 0:
members[i].username['email'] = members[i].emails[0]

# Go through all platform usernames
member_platforms = set(member.username)
Expand Down