diff --git a/backend/src/serverless/integrations/services/integrations/githubIntegrationService.ts b/backend/src/serverless/integrations/services/integrations/githubIntegrationService.ts
index 83cf80fc51..5ce92b0d8c 100644
--- a/backend/src/serverless/integrations/services/integrations/githubIntegrationService.ts
+++ b/backend/src/serverless/integrations/services/integrations/githubIntegrationService.ts
@@ -1100,7 +1100,7 @@ export class GithubIntegrationService extends IntegrationServiceBase {
for (const record of records) {
switch (record.__typename) {
case GithubPullRequestEvents.ASSIGN:
- if (record.actor.login && record.assignee.login) {
+ if (record.actor?.login && record.assignee?.login) {
const member = await GithubIntegrationService.parseMember(record.actor, context)
const objectMember = await GithubIntegrationService.parseMember(
record.assignee,
@@ -1678,7 +1678,7 @@ export class GithubIntegrationService extends IntegrationServiceBase {
for (const record of records) {
switch (record.__typename) {
case GithubPullRequestEvents.CLOSE:
- if (record.actor.login) {
+ if (record.actor?.login) {
const member = await GithubIntegrationService.parseMember(record.actor, context)
out.push({
username: member.username[PlatformType.GITHUB].username,
diff --git a/backend/src/services/memberService.ts b/backend/src/services/memberService.ts
index b9799721fb..c99688369f 100644
--- a/backend/src/services/memberService.ts
+++ b/backend/src/services/memberService.ts
@@ -346,9 +346,11 @@ export default class MemberService extends LoggerBase {
// Fetch organization ids for these domains
const organizationService = new OrganizationService(this.options)
for (const domain of emailDomains) {
- const organizationRecord = await organizationService.findByUrl(domain)
- if (organizationRecord) {
- organizations.push(organizationRecord.id)
+ if (domain) {
+ const organizationRecord = await organizationService.findByUrl(domain)
+ if (organizationRecord) {
+ organizations.push(organizationRecord.id)
+ }
}
}
}
diff --git a/services/libs/integrations/src/integrations/activityTypes.ts b/services/libs/integrations/src/integrations/activityTypes.ts
index 31759fd639..d6045e6de1 100644
--- a/services/libs/integrations/src/integrations/activityTypes.ts
+++ b/services/libs/integrations/src/integrations/activityTypes.ts
@@ -196,7 +196,7 @@ export const DEFAULT_ACTIVITY_TYPE_SETTINGS: DefaultActivityTypes = {
formatter: {
channel: defaultGithubChannelFormatter,
self: (activity) => {
- const prNumberAndTitle = `#${activity.url.split('/')[6]} ${activity.parent.title}`
+ const prNumberAndTitle = `#${activity.url.split('/')[6]} ${activity.parent?.title}`
return `${prNumberAndTitle}`
},
},
@@ -211,7 +211,7 @@ export const DEFAULT_ACTIVITY_TYPE_SETTINGS: DefaultActivityTypes = {
formatter: {
channel: defaultGithubChannelFormatter,
self: (activity) => {
- const prNumberAndTitle = `#${activity.url.split('/')[6]} ${activity.parent.title}`
+ const prNumberAndTitle = `#${activity.url.split('/')[6]} ${activity.parent?.title}`
return `${prNumberAndTitle} to ${activity.objectMember.displayName}`
},
},
@@ -226,7 +226,7 @@ export const DEFAULT_ACTIVITY_TYPE_SETTINGS: DefaultActivityTypes = {
formatter: {
channel: defaultGithubChannelFormatter,
self: (activity) => {
- const prNumberAndTitle = `#${activity.url.split('/')[6]} ${activity.parent.title}`
+ const prNumberAndTitle = `#${activity.url.split('/')[6]} ${activity.parent?.title}`
return `${prNumberAndTitle}`
},
},
@@ -241,7 +241,7 @@ export const DEFAULT_ACTIVITY_TYPE_SETTINGS: DefaultActivityTypes = {
formatter: {
channel: defaultGithubChannelFormatter,
self: (activity) => {
- const prNumberAndTitle = `#${activity.url.split('/')[6]} ${activity.parent.title}`
+ const prNumberAndTitle = `#${activity.url.split('/')[6]} ${activity.parent?.title}`
return `${prNumberAndTitle} from ${activity.objectMember.displayName}`
},
},
@@ -257,7 +257,7 @@ export const DEFAULT_ACTIVITY_TYPE_SETTINGS: DefaultActivityTypes = {
channel: defaultGithubChannelFormatter,
self: (activity) => {
const prNumberAndTitle = `#${activity.url.split('/')[6].split('#')[0]} ${
- activity.parent.title
+ activity.parent?.title
}`
return `${prNumberAndTitle}`
},