Merge pull request #185 from CollActionteam/development

Development to Production

Author: Xazin

.env.example

@@ -15,8 +15,6 @@ FIREBASE_AUTH_DOMAIN =
 FIREBASE_PROJECT_ID = 
 GOOGLE_APPLICATION_CREDENTIALS = './serviceAccountKey.json'
 
-# AWS Related
-AWS_BUCKET_NAME = collaction-development
-AWS_BUCKET_REGION = eu-central-1
-AWS_S3_ACCESS_KEY_ID = 
-AWS_S3_SECRET_ACCESS_KEY = 
+# Azure Related
+AZURE_CONNECTION = 
+AZURE_CONTAINER =

package-lock.json

@@ -28,6 +28,7 @@
         "migration:revert": "npm run typeorm:cli -- migration:revert -d src/ormconfig.ts"
     },
     "dependencies": {
+        "@azure/storage-blob": "^12.14.0",
         "@nestjs/common": "^9.0.3",
         "@nestjs/config": "^2.3.1",
         "@nestjs/core": "^9.0.3",
@@ -63,6 +64,7 @@
         "@nestjs/testing": "^9.0.3",
         "@types/express": "^4.17.17",
         "@types/jest": "29.5.0",
+        "@types/multer": "^1.4.7",
         "@types/node": "^18.15.11",
         "@types/supertest": "^2.0.12",
         "@typescript-eslint/eslint-plugin": "^5.57.1",

package.json

@@ -1,11 +1,14 @@
-import { Body, Controller, Delete, Param, Patch, Post } from '@nestjs/common';
-import { ApiBody, ApiTags } from '@nestjs/swagger';
+import { Body, Controller, Delete, Get, Param, Patch, Post, Query } from '@nestjs/common';
+import { ApiBody, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { ICQRSHandler } from '@common/cqrs';
 import { CreateCommitmentCommand, DeleteCommitmentCommand, UpdateCommitmentCommand } from '@modules/commitment';
-import { Identifiable } from '@domain/core';
-import { CreateCommitmentDto, UpdateCommitmentDto } from '@infrastructure/commitment';
+import { Identifiable, IPaginatedList } from '@domain/core';
+import { CreateCommitmentDto, PaginatedCommitmentResponse, UpdateCommitmentDto } from '@infrastructure/commitment';
 import { FirebaseGuard } from '@modules/auth/decorators';
 import { UserRole } from '@domain/auth/enum';
+import { PaginationDto } from '@infrastructure/pagination';
+import { ListCommitmentsQuery } from '@modules/commitment/cqrs/query/list-commitments.query';
+import { ICommitment } from '@domain/commitment';
 
 @Controller('v1/commitments')
 @ApiTags('Commitment')
@@ -31,4 +34,15 @@ export class CommitmentController {
     async updateCommitment(@Param('id') id: string, @Body() updateDto: UpdateCommitmentDto): Promise<Identifiable> {
         return await this.cqrsHandler.execute(UpdateCommitmentCommand, { id, updateDto });
     }
+    @Get()
+    @ApiOperation({ summary: 'Retrieve a paginated list of Commitments' })
+    @ApiResponse({
+        status: 200,
+        description: 'Returns the found Commitments if any',
+        type: PaginatedCommitmentResponse,
+    })
+    @FirebaseGuard(UserRole.MODERATOR, UserRole.ADMIN)
+    async getAllCommitments(@Query() pagination: PaginationDto, @Query('tags') tags: string[]): Promise<IPaginatedList<ICommitment>> {
+        return this.cqrsHandler.fetch(ListCommitmentsQuery, { ...pagination, filter: { tags } });
+    }
 }

src/api/rest/commitments/v1/controller/commitment.controller.ts

@@ -2,7 +2,14 @@ import { Body, Controller, Get, Param, Post, Query, UploadedFiles, UseIntercepto
 import { ApiBody, ApiConsumes, ApiOperation, ApiParam, ApiQuery, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { FileFieldsInterceptor } from '@nestjs/platform-express';
 import { Identifiable, IPaginatedList } from '@domain/core';
-import { CrowdAction, CrowdActionStatusEnum, ICrowdAction } from '@domain/crowdaction';
+import {
+    CrowdAction,
+    CrowdActionStatusEnum,
+    ICrowdAction,
+    joinStatusToFilter,
+    statusToFilter,
+    statusesToFilter,
+} from '@domain/crowdaction';
 import { ICQRSHandler } from '@common/cqrs';
 import { CreateCrowdActionDto, FilterCrowdActionDto, GetCrowdActionDto, PaginatedCrowdActionResponse } from '@infrastructure/crowdaction';
 import {
@@ -33,20 +40,23 @@ export class CrowdActionController {
     })
     async getAllCrowdActions(
         @Query() { page, pageSize }: PaginationDto,
-        @Query() { id, status, joinStatus, startAt, joinEndAt, endAt, category, subcategory, slug }: FilterCrowdActionDto,
+        @Query() { id, status, joinStatus, slug }: FilterCrowdActionDto,
     ): Promise<IPaginatedList<GetCrowdActionDto>> {
-        const filter: any = {
+        let filter: any = {
             id: id !== undefined ? { in: id } : undefined,
-            status: status !== undefined ? { in: status } : undefined,
-            joinStatus: joinStatus !== undefined ? { in: joinStatus } : undefined,
-            startAt: startAt !== undefined ? { in: startAt } : undefined,
-            joinEndAt: joinEndAt !== undefined ? { in: joinEndAt } : undefined,
-            endAt: endAt !== undefined ? { in: endAt } : undefined,
-            category: category !== undefined ? { in: category } : undefined,
-            subcategory: subcategory !== undefined ? { in: subcategory } : undefined,
             slug: slug !== undefined ? { in: slug } : undefined,
         };
 
+        if (status != undefined) {
+            const statusFilter = status instanceof Array ? statusesToFilter(status) : statusToFilter(status);
+            filter = { ...filter, ...statusFilter };
+        }
+
+        if (joinStatus != undefined) {
+            const joinStatusFilter = joinStatusToFilter(joinStatus);
+            filter['joinEndAt'] = joinStatusFilter.joinEndAt;
+        }
+
         for (const param in filter) {
             if (filter[param] === undefined) delete filter[param];
         }

src/api/rest/crowdactions/v1/controller/crowdaction.controller.ts

@@ -0,0 +1,69 @@
+import { Body, Controller, Get, Param, Post, Put } from '@nestjs/common';
+import { ApiBody, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { ICQRSHandler } from '@common/cqrs';
+import { Forum } from '@domain/forum';
+import { CreateForumDto, ForumDto, ForumPermissionDto, UpdateForumPermissionDto } from '@infrastructure/forum';
+import { CreateForumCommand, FetchAllForums, GetForumHierarchy, UpdateForumPermissionsCommand } from '@modules/forum';
+import { CurrentUser, FirebaseGuard } from '@modules/auth/decorators';
+import { Identifiable } from '@domain/core';
+import { AuthUser } from '@domain/auth/entity';
+import { IdentifiableResponse } from '@api/rest/core';
+import { UserRole } from '@domain/auth/enum';
+
+@Controller('v1/forum')
+@ApiTags('Forum')
+export class ForumController {
+    constructor(private readonly cqrsHandler: ICQRSHandler) {}
+
+    @Post()
+    @FirebaseGuard(UserRole.ADMIN)
+    @ApiOperation({ summary: 'Create a forum' })
+    @ApiResponse({
+        status: 201,
+        description: '',
+        type: IdentifiableResponse,
+    })
+    @ApiBody({ type: CreateForumDto, description: "Creates a new forum and it's permissions" })
+    async createForum(@CurrentUser() authUser: AuthUser, @Body() forumDto: CreateForumDto): Promise<Identifiable> {
+        return await this.cqrsHandler.execute(CreateForumCommand, {
+            data: forumDto,
+            userRole: authUser.customClaims.role,
+        });
+    }
+
+    @Get()
+    @ApiOperation({ summary: 'Fetch all forums' })
+    @ApiResponse({
+        status: 200,
+        description: 'Returns all forums',
+        type: [ForumDto],
+    })
+    async getAllForums(): Promise<Forum[]> {
+        return await this.cqrsHandler.fetch(FetchAllForums, {});
+    }
+
+    @Get(':forumId')
+    @ApiOperation({ summary: 'Fetch forum and all its children' })
+    @ApiResponse({
+        status: 200,
+        description: 'Fetch forum and all its children',
+        type: [ForumDto],
+    })
+    async getForumHierarchy(@Param('forumId') id: string): Promise<Forum[]> {
+        return await this.cqrsHandler.fetch(GetForumHierarchy, id);
+    }
+
+    @Put(':forumId')
+    @ApiOperation({ summary: 'Update a forums permissions' })
+    @ApiResponse({
+        status: 201,
+        description: '',
+        type: ForumPermissionDto,
+    })
+    async updateForumPermissions(
+        @Param('forumId') id: string,
+        @Body() updateForumPermissionBody: UpdateForumPermissionDto,
+    ): Promise<Identifiable> {
+        return await this.cqrsHandler.execute(UpdateForumPermissionsCommand, { forumId: id, data: updateForumPermissionBody });
+    }
+}

src/api/rest/forum/v1/controller/forum.controller.ts

@@ -0,0 +1 @@
+export * from './forum.controller';

src/api/rest/forum/v1/controller/index.ts

@@ -0,0 +1 @@
+export * from './post.controller';

src/api/rest/posts/v1/controller/index.ts

@@ -0,0 +1,17 @@
+import { Controller, Get, Param, Query } from '@nestjs/common';
+import { ApiTags } from '@nestjs/swagger';
+import { ICQRSHandler } from '@common/cqrs';
+import { PaginationDto } from '@infrastructure/pagination';
+import { ListPostsByThreadQuery } from '@modules/post/cqrs/query/list-posts-by-thread.query';
+
+@Controller('v1/posts')
+@ApiTags('Posts')
+export class PostController {
+    constructor(private readonly cqrsHandler: ICQRSHandler) {}
+
+    @Get(':threadId')
+    async getPostsByThread(@Param('threadId') threadId: string, @Query() { page, pageSize }: PaginationDto) {
+        const foundPosts = await this.cqrsHandler.fetch(ListPostsByThreadQuery, { page, pageSize, filter: { threadId } });
+        return { pageInfo: foundPosts.pageInfo, items: foundPosts.items };
+    }
+}

src/api/rest/posts/v1/controller/post.controller.ts

@@ -11,7 +11,7 @@ import { CurrentUser, FirebaseGuard } from '@modules/auth/decorators';
 import { AuthUser } from '@domain/auth/entity';
 import { Profile } from '@domain/profile';
 import { UserRole } from '@domain/auth/enum';
-import { UploadImageTypeEnum } from '@modules/core/s3/enum';
+import { UploadImageTypeEnum } from '@modules/core';
 
 @Controller('v1/profiles')
 @ApiTags('Profiles')