Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"dependencies": {
"@alkemio/matrix-adapter-lib": "^0.3.6",
"@apollo/server": "^4.10.2",
"@alkemio/notifications-lib": "^0.8.3",
"@alkemio/notifications-lib": "^0.8.5",
"@elastic/elasticsearch": "^8.4.0",
"@nestjs/apollo": "^12.1.0",
"@nestjs/axios": "^3.0.2",
Expand Down
38 changes: 28 additions & 10 deletions src/domain/community/community/community.resolver.mutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ import { AssignCommunityRoleToVirtualInput } from './dto/community.dto.role.assi
import { RemoveCommunityRoleFromVirtualInput } from './dto/community.dto.role.remove.virtual';
import { VirtualContributorAuthorizationService } from '../virtual-contributor/virtual.contributor.service.authorization';
import { VirtualContributorService } from '../virtual-contributor/virtual.contributor.service';
import { IVirtualContributor } from '../virtual-contributor';
import {
IVirtualContributor,
VirtualContributor,
} from '../virtual-contributor';
import { EntityNotInitializedException } from '@common/exceptions';
import { CommunityInvitationException } from '@common/exceptions/community.invitation.exception';
import { SpaceIngestionPurpose } from '@services/infrastructure/event-bus/commands';
Expand All @@ -60,6 +63,7 @@ import { IContributor } from '../contributor/contributor.interface';
import { ContributorService } from '../contributor/contributor.service';
import { InvitationExternalService } from '../invitation.external/invitation.external.service';
import { AiServerAdapter } from '@services/adapters/ai-server-adapter/ai.server.adapter';
import { NotificationInputCommunityVirtualContributorInvitation } from '@services/adapters/notification-adapter/dto/notification.dto.input.community.vc.invitation';

const IAnyInvitation = createUnionType({
name: 'AnyInvitation',
Expand Down Expand Up @@ -571,15 +575,29 @@ export class CommunityResolverMutations {
);
invitation = await this.invitationService.save(invitation);

// Send the notification
const notificationInput: NotificationInputCommunityInvitation = {
triggeredBy: agentInfo.userID,
community: community,
invitedUser: invitedContributor.id,
welcomeMessage,
};

await this.notificationAdapter.invitationCreated(notificationInput);
if (invitedContributor instanceof VirtualContributor) {
const notificationInput: NotificationInputCommunityVirtualContributorInvitation =
{
triggeredBy: agentInfo.userID,
community: community,
virtualContributorID: invitedContributor.id,
account: invitedContributor.account,
};

await this.notificationAdapter.invitationVirtualContributorCreated(
notificationInput
);
} else {
// Send the notification
const notificationInput: NotificationInputCommunityInvitation = {
triggeredBy: agentInfo.userID,
community: community,
invitedUser: invitedContributor.id,
welcomeMessage,
};

await this.notificationAdapter.invitationCreated(notificationInput);
}

return invitation;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { ICommunity } from '@domain/community/community/community.interface';
import { NotificationInputBase } from './notification.dto.input.base';
import { IAccount } from '@domain/space/account/account.interface';

export interface NotificationInputCommunityVirtualContributorInvitation
extends NotificationInputBase {
community: ICommunity;
account: IAccount;
virtualContributorID: string;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,17 @@ import { ActivityModule } from '@src/platform/activity/activity.module';
import { NotificationAdapter } from './notification.adapter';
import { NotificationPayloadBuilder } from './notification.payload.builder';
import { UrlGeneratorModule } from '@services/infrastructure/url-generator/url.generator.module';
import { AccountHostModule } from '@domain/space/account/account.host.module';
import { VirtualContributorModule } from '@domain/community/virtual-contributor/virtual.contributor.module';

@Module({
imports: [
ActivityModule,
EntityResolverModule,
UrlGeneratorModule,
TypeOrmModule.forFeature([Post, Whiteboard, Community]),
AccountHostModule,
VirtualContributorModule,
],
providers: [NotificationAdapter, NotificationPayloadBuilder],
exports: [NotificationAdapter],
Expand Down
18 changes: 18 additions & 0 deletions src/services/adapters/notification-adapter/notification.adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { NotificationInputCommunityInvitation } from './dto/notification.dto.inp
import { NotificationInputCommentReply } from './dto/notification.dto.input.comment.reply';
import { NotificationInputCommunityInvitationExternal } from './dto/notification.dto.input.community.invitation.external';
import { NotificationInputPlatformGlobalRoleChange } from './dto/notification.dto.input.platform.global.role.change';
import { NotificationInputCommunityVirtualContributorInvitation } from './dto/notification.dto.input.community.vc.invitation';

@Injectable()
export class NotificationAdapter {
Expand Down Expand Up @@ -320,6 +321,23 @@ export class NotificationAdapter {
this.notificationsClient.emit<number>(event, payload);
}

public async invitationVirtualContributorCreated(
eventData: NotificationInputCommunityVirtualContributorInvitation
): Promise<void> {
const event = NotificationEventType.COMMUNITY_INVITATION_CREATED_VC;
this.logEventTriggered(eventData, event);

const payload =
await this.notificationPayloadBuilder.buildInvitationVirtualContributorCreatedNotificationPayload(
eventData.triggeredBy,
eventData.virtualContributorID,
eventData.account,
eventData.community
);

this.notificationsClient.emit<number>(event, payload);
}

public async externalInvitationCreated(
eventData: NotificationInputCommunityInvitationExternal
): Promise<void> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ import { IDiscussion } from '@platform/forum-discussion/discussion.interface';
import { IContributor } from '@domain/community/contributor/contributor.interface';
import { UUID_LENGTH } from '@common/constants/entity.field.length.constants';
import { VirtualContributor } from '@domain/community/virtual-contributor/virtual.contributor.entity';
import { AccountHostService } from '@domain/space/account/account.host.service';
import { IAccount } from '@domain/space/account/account.interface';
import { VirtualContributorService } from '@domain/community/virtual-contributor/virtual.contributor.service';
import { VirtualContributorInvitationCreatedEventPayload } from '@alkemio/notifications-lib/dist/dto/virtual.contributor.invitation.created.event.payload';

@Injectable()
export class NotificationPayloadBuilder {
Expand All @@ -69,7 +73,9 @@ export class NotificationPayloadBuilder {
private readonly logger: LoggerService,
private configService: ConfigService,
private contributionResolverService: ContributionResolverService,
private urlGeneratorService: UrlGeneratorService
private urlGeneratorService: UrlGeneratorService,
private accountHostService: AccountHostService,
private virtualContributorService: VirtualContributorService
) {}

async buildApplicationCreatedNotificationPayload(
Expand Down Expand Up @@ -114,6 +120,36 @@ export class NotificationPayloadBuilder {
return payload;
}

async buildInvitationVirtualContributorCreatedNotificationPayload(
invitationCreatorID: string,
virtualContributorID: string,
account: IAccount,
community: ICommunity
): Promise<VirtualContributorInvitationCreatedEventPayload> {
const spacePayload = await this.buildSpacePayload(
community,
invitationCreatorID
);
const host = await this.accountHostService.getHostOrFail(account);
const hostPayload = await this.getContributorPayloadOrFail(host.id);
const virtualContributor =
await this.virtualContributorService.getVirtualContributorOrFail(
virtualContributorID,
{ relations: { profile: true } }
);

return {
host: hostPayload,
virtualContributor: {
name: virtualContributor.profile.displayName,
url: this.urlGeneratorService.generateUrlForVC(
virtualContributor.nameID
),
},
...spacePayload,
};
}

async buildExternalInvitationCreatedNotificationPayload(
invitationCreatorID: string,
invitedUserEmail: string,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,10 @@ export class UrlGeneratorService {
return url;
}

public generateUrlForVC(nameID: string): string {
return `${this.endpoint_cluster}/vc/${nameID}`;
}

async createJourneyAdminCommunityURL(space: ISpace): Promise<string> {
const spaceNameID = space.nameID;
const baseURL = `${this.endpoint_cluster}/admin/spaces/${spaceNameID}`;
Expand Down