Feature/organization

src/analytics/application/auth-event.handler.ts

@@ -10,7 +10,6 @@ export class AuthCreatedEventHandler implements IEventHandler<AuthCreatedEvent>
   handle(event: AuthCreatedEvent) {
     this.analyticsService.trackEvent(event.userId.value, 'Signed Up', {
       email: event.email,
-      role: event.role,
     });
   }
 }

src/article/command/application/create-article/create-article.command.ts

@@ -0,0 +1,17 @@
+import { ICommand } from '@nestjs/cqrs';
+
+export class CreateArticleCommand implements ICommand {
+  constructor(
+    public readonly organizationId: string,
+    public readonly title: string,
+    public readonly organization: string,
+    public readonly description: string,
+    public readonly location: string,
+    public readonly startAt: string,
+    public readonly endAt: string,
+    public readonly tags: string[],
+    public readonly registrationUrl?: string,
+    public readonly registrationStartAt?: string,
+    public readonly registrationEndAt?: string,
+  ) {}
+}

src/article/command/application/create-article/create-article.use-case.ts

@@ -1,11 +1,11 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Identifier } from 'src/shared/core/domain/identifier';
 import { Article } from '../../domain/article';
-import { CreateArticleRequestDto } from './dto/create-article.request.dto';
 import { ARTICLE_COMMAND_REPOSITORY, ArticleCommandRepository } from '../../domain/article.command.repository';
 import { CreateArticleResponseDto } from './dto/create-article.response.dto';
 import { Tag } from 'src/tag/domain/entity/tag';
 import { TAG_REPOSITORY, TagRepository } from 'src/tag/domain/repository/tag.repository';
+import { CreateArticleCommand } from './create-article.command';
 
 @Injectable()
 export class CreateArticleUseCase {
@@ -16,11 +16,11 @@ export class CreateArticleUseCase {
     private readonly tagRepo: TagRepository,
   ) {}
 
-  async execute(reqDto: CreateArticleRequestDto): Promise<CreateArticleResponseDto> {
+  async execute(command: CreateArticleCommand): Promise<CreateArticleResponseDto> {
     const tags: Tag[] = [];
     const articleId = Identifier.create();
 
-    for (const tag of reqDto.tags) {
+    for (const tag of command.tags) {
       const existingTag = await this.tagRepo.findByName(tag);
 
       if (!existingTag) {
@@ -41,15 +41,16 @@ export class CreateArticleUseCase {
     // Article 도메인 엔티티 생성
     const article = Article.create({
       id: articleId,
-      title: reqDto.title,
-      organization: reqDto.organization,
-      description: reqDto.description,
-      location: reqDto.location,
-      startAt: new Date(reqDto.startAt),
-      endAt: new Date(reqDto.endAt),
-      registrationUrl: reqDto.registrationUrl,
-      registrationStartAt: reqDto.registrationStartAt ? new Date(reqDto.registrationStartAt) : undefined,
-      registrationEndAt: reqDto.registrationEndAt ? new Date(reqDto.registrationEndAt) : undefined,
+      title: command.title,
+      organizationId: Identifier.from(command.organizationId),
+      organization: command.organization,
+      description: command.description,
+      location: command.location,
+      startAt: new Date(command.startAt),
+      endAt: new Date(command.endAt),
+      registrationUrl: command.registrationUrl,
+      registrationStartAt: command.registrationStartAt ? new Date(command.registrationStartAt) : undefined,
+      registrationEndAt: command.registrationEndAt ? new Date(command.registrationEndAt) : undefined,
       scrapCount: 0,
       viewCount: 0,
       mediaIds: [],

src/article/command/application/delete-article/delete-article.comand.ts

@@ -0,0 +1,8 @@
+import { ICommand } from '@nestjs/cqrs';
+
+export class DeleteArticleCommand implements ICommand {
+  constructor(
+    public readonly id: string,
+    public readonly organizationId: string,
+  ) {}
+}

src/article/command/application/delete-article/delete-article.use-case.ts

@@ -1,5 +1,6 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { ARTICLE_COMMAND_REPOSITORY, ArticleCommandRepository } from '../../domain/article.command.repository';
+import { DeleteArticleCommand } from './delete-article.comand';
 
 @Injectable()
 export class DeleteArticleUseCase {
@@ -8,7 +9,7 @@ export class DeleteArticleUseCase {
     private readonly articleRepo: ArticleCommandRepository,
   ) {}
 
-  async execute(id: string): Promise<void> {
-    await this.articleRepo.deleteById(id);
+  async execute(command: DeleteArticleCommand): Promise<void> {
+    await this.articleRepo.deleteById(command.id);
   }
 }

src/article/command/application/update-article/update-article.command.ts

@@ -0,0 +1,18 @@
+import { ICommand } from '@nestjs/cqrs';
+
+export class UpdateArticleCommand implements ICommand {
+  constructor(
+    public readonly id: string,
+    public readonly organizationId: string,
+    public readonly title?: string,
+    public readonly organization?: string,
+    public readonly description?: string,
+    public readonly location?: string,
+    public readonly startAt?: string,
+    public readonly endAt?: string,
+    public readonly tags?: string[],
+    public readonly registrationUrl?: string,
+    public readonly registrationStartAt?: string,
+    public readonly registrationEndAt?: string,
+  ) {}
+}

src/article/command/application/update-article/update-article.use-case.ts

@@ -1,10 +1,10 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Identifier } from 'src/shared/core/domain/identifier';
 import { ARTICLE_COMMAND_REPOSITORY, ArticleCommandRepository } from '../../domain/article.command.repository';
-import { UpdateArticleRequestDto } from './dto/update-article.request.dto';
 import { Tag } from 'src/tag/domain/entity/tag';
 import { TAG_REPOSITORY, TagRepository } from 'src/tag/domain/repository/tag.repository';
 import { MEDIA_COMMAND_REPOSITORY, MediaCommandRepository } from 'src/media/command/domain/media.command.repository';
+import { UpdateArticleCommand } from './update-article.command';
 
 @Injectable()
 export class UpdateArticleUseCase {
@@ -17,15 +17,15 @@ export class UpdateArticleUseCase {
     private readonly mediaCommandRepo: MediaCommandRepository,
   ) {}
 
-  async execute(articleId: string, reqDto: UpdateArticleRequestDto): Promise<void> {
+  async execute(command: UpdateArticleCommand): Promise<void> {
     // 기존 Article 조회
-    const article = await this.articleCommandRepo.findById(articleId);
+    const article = await this.articleCommandRepo.findById(command.id);
 
     // 태그 처리
-    if (reqDto.tags !== undefined) {
+    if (command.tags !== undefined) {
       const tags: Tag[] = [];
 
-      for (const tagName of reqDto.tags) {
+      for (const tagName of command.tags) {
         const existingTag = await this.tagRepo.findByName(tagName);
 
         if (!existingTag) {
@@ -49,15 +49,15 @@ export class UpdateArticleUseCase {
 
     // Article 업데이트
     article.update({
-      title: reqDto.title,
-      organization: reqDto.organization,
-      description: reqDto.description,
-      location: reqDto.location,
-      startAt: reqDto.startAt ? new Date(reqDto.startAt) : undefined,
-      endAt: reqDto.endAt ? new Date(reqDto.endAt) : undefined,
-      registrationUrl: reqDto.registrationUrl,
-      registrationStartAt: reqDto.registrationStartAt ? new Date(reqDto.registrationStartAt) : undefined,
-      registrationEndAt: reqDto.registrationEndAt ? new Date(reqDto.registrationEndAt) : undefined,
+      title: command.title,
+      organization: command.organization,
+      description: command.description,
+      location: command.location,
+      startAt: command.startAt ? new Date(command.startAt) : undefined,
+      endAt: command.endAt ? new Date(command.endAt) : undefined,
+      registrationUrl: command.registrationUrl,
+      registrationStartAt: command.registrationStartAt ? new Date(command.registrationStartAt) : undefined,
+      registrationEndAt: command.registrationEndAt ? new Date(command.registrationEndAt) : undefined,
     });
 
     await this.articleCommandRepo.update(article);

src/article/command/article.command.module.ts

@@ -1,7 +1,10 @@
 import { MikroOrmModule } from '@mikro-orm/nestjs';
 import { Module } from '@nestjs/common';
 import { ArticleEntity } from './infrastructure/article.entity';
-import { ArticleCommandController } from './presentation/article.command.controller';
+import {
+  ArticleCommandController,
+  OrganizationArticleCommandController,
+} from './presentation/article.command.controller';
 import { CreateArticleUseCase } from './application/create-article/create-article.use-case';
 import { UpdateArticleUseCase } from './application/update-article/update-article.use-case';
 import { DeleteArticleUseCase } from './application/delete-article/delete-article.use-case';
@@ -45,6 +48,6 @@ const listeners = [IncreaseScrapCountListener, DecreaseScrapCountListener];
       useClass: MediaCommandRepositoryImpl,
     },
   ],
-  controllers: [ArticleCommandController],
+  controllers: [ArticleCommandController, OrganizationArticleCommandController],
 })
 export class ArticleCommandModule {}

src/article/command/domain/article.ts

@@ -9,15 +9,16 @@ export interface ArticleProps extends BaseEntityProps {
   organization: string;
   location: string;
   description: string;
-  registrationUrl: string;
   startAt: Date;
   endAt: Date;
+  registrationUrl?: string;
   registrationStartAt?: Date;
   registrationEndAt?: Date;
   scrapCount: number;
   viewCount: number;
   mediaIds: Identifier[];
   tags: Tag[];
+  organizationId: Identifier;
 }
 
 export class Article extends BaseDomainEntity<ArticleProps> {
@@ -101,7 +102,7 @@ export class Article extends BaseDomainEntity<ArticleProps> {
     return this.props.description;
   }
 
-  get registrationUrl(): string {
+  get registrationUrl(): string | undefined {
     return this.props.registrationUrl;
   }
 
@@ -137,6 +138,10 @@ export class Article extends BaseDomainEntity<ArticleProps> {
     return this.props.tags;
   }
 
+  get organizationId(): Identifier {
+    return this.props.organizationId;
+  }
+
   public update(props: {
     title?: string;
     organization?: string;

src/article/command/infrastructure/article.entity.ts

@@ -8,6 +8,9 @@ export class ArticleEntity extends BaseEntity {
   @Property({ type: 'varchar' })
   title: string;
 
+  @Property({ type: 'varchar' })
+  organizationId: string;
+
   @Property({ type: 'varchar' })
   organization: string;
 
@@ -17,8 +20,8 @@ export class ArticleEntity extends BaseEntity {
   @Property({ type: 'varchar', length: 2047 })
   description: string;
 
-  @Property({ type: 'varchar' })
-  registrationUrl: string;
+  @Property({ type: 'varchar', nullable: true })
+  registrationUrl?: string;
 
   @Property({ type: 'datetime' })
   startAt: Date;

src/article/command/infrastructure/article.mapper.ts

@@ -12,6 +12,7 @@ export class ArticleMapper {
       createdAt: entity.createdAt,
       updatedAt: entity.updatedAt,
       title: entity.title,
+      organizationId: Identifier.from(entity.organizationId),
       organization: entity.organization,
       location: entity.location,
       description: entity.description,
@@ -33,6 +34,7 @@ export class ArticleMapper {
     entity.createdAt = domain.createdAt;
     entity.updatedAt = domain.updatedAt;
     entity.title = domain.title;
+    entity.organizationId = domain.organizationId.value;
     entity.organization = domain.organization;
     entity.location = domain.location;
     entity.description = domain.description;

src/article/command/presentation/article.command.controller.ts

@@ -1,12 +1,17 @@
-import { Body, Controller, Delete, Param, Patch, Post } from '@nestjs/common';
+import { Body, Controller, Delete, Param, Patch, Post, UseGuards } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { CreateArticleUseCase } from '../application/create-article/create-article.use-case';
-import { CreateArticleRequestDto } from '../application/create-article/dto/create-article.request.dto';
+import { CreateArticleRequestDto } from './dto/create-article.request.dto';
 import { CreateArticleResponseDto } from '../application/create-article/dto/create-article.response.dto';
 import { DeleteArticleUseCase } from '../application/delete-article/delete-article.use-case';
 import { UpdateArticleUseCase } from '../application/update-article/update-article.use-case';
-import { UpdateArticleRequestDto } from '../application/update-article/dto/update-article.request.dto';
+import { UpdateArticleRequestDto } from './dto/update-article.request.dto';
 import { ArticleCommandDocs } from './article.command.docs';
+import { AuthGuard } from '@nestjs/passport';
+import { Organization, OrganizationPayload } from 'src/shared/core/presentation/organization.decorator';
+import { RolesGuard } from 'src/auth/core/infrastructure/guard/role.guard';
+import { Roles } from 'src/shared/core/presentation/role.decorator';
+import { Role } from 'src/auth/core/domain/value-object/role';
 
 @ApiTags('article')
 @Controller('article')
@@ -20,18 +25,59 @@ export class ArticleCommandController {
   @Post()
   @ArticleCommandDocs('create')
   async createArticle(@Body() reqDto: CreateArticleRequestDto): Promise<CreateArticleResponseDto> {
-    return await this.createArticleUseCase.execute(reqDto);
+    return await this.createArticleUseCase.execute({ ...reqDto, organizationId: '1' });
   }
 
   @Patch(':id')
   @ArticleCommandDocs('update')
   async updateArticle(@Param('id') id: string, @Body() reqDto: UpdateArticleRequestDto): Promise<void> {
-    return await this.updateArticleUseCase.execute(id, reqDto);
+    return await this.updateArticleUseCase.execute({ ...reqDto, id, organizationId: '1' });
   }
 
   @Delete(':id')
   @ArticleCommandDocs('delete')
   async delete(@Param('id') id: string): Promise<void> {
-    return await this.deleteArticleUseCase.execute(id);
+    return await this.deleteArticleUseCase.execute({ id, organizationId: '1' });
+  }
+}
+
+@ApiTags('organization-article')
+@Controller('organization/article')
+export class OrganizationArticleCommandController {
+  constructor(
+    private readonly createArticleUseCase: CreateArticleUseCase,
+    private readonly updateArticleUseCase: UpdateArticleUseCase,
+    private readonly deleteArticleUseCase: DeleteArticleUseCase,
+  ) {}
+
+  @Post()
+  @UseGuards(AuthGuard('jwt-access'), RolesGuard)
+  @Roles(Role.ORGANIZATION)
+  @ArticleCommandDocs('create')
+  async createArticle(
+    @Organization() organization: OrganizationPayload,
+    @Body() reqDto: CreateArticleRequestDto,
+  ): Promise<CreateArticleResponseDto> {
+    return await this.createArticleUseCase.execute({ ...reqDto, organizationId: organization.organizationId });
+  }
+
+  @Patch(':id')
+  @UseGuards(AuthGuard('jwt-access'), RolesGuard)
+  @Roles(Role.ORGANIZATION)
+  @ArticleCommandDocs('update')
+  async updateArticle(
+    @Organization() organization: OrganizationPayload,
+    @Param('id') id: string,
+    @Body() reqDto: UpdateArticleRequestDto,
+  ): Promise<void> {
+    return await this.updateArticleUseCase.execute({ ...reqDto, id, organizationId: organization.organizationId });
+  }
+
+  @Delete(':id')
+  @UseGuards(AuthGuard('jwt-access'), RolesGuard)
+  @Roles(Role.ORGANIZATION)
+  @ArticleCommandDocs('delete')
+  async delete(@Organization() organization: OrganizationPayload, @Param('id') id: string): Promise<void> {
+    return await this.deleteArticleUseCase.execute({ id, organizationId: organization.organizationId });
   }
 }

src/article/command/presentation/article.command.docs.ts

@@ -9,7 +9,7 @@ import {
   ApiOperation,
 } from '@nestjs/swagger';
 import { createDocs } from 'src/shared/core/presentation/base.docs';
-import { UpdateArticleRequestDto } from '../application/update-article/dto/update-article.request.dto';
+import { UpdateArticleRequestDto } from './dto/update-article.request.dto';
 
 export type ArticleCommandEndpoint = 'create' | 'update' | 'delete';
 

src/article/command/application/create-article/dto/create-article.request.dto.ts → src/article/command/presentation/dto/create-article.request.dto.ts

@@ -27,7 +27,7 @@ export class CreateArticleRequestDto {
 
   @IsString()
   @IsOptional()
-  registrationUrl: string;
+  registrationUrl?: string;
 
   @IsString()
   @IsOptional()