Merge pull request #181 from CollActionteam/undo_reverts

Undo reverts

Author: MichaelSlatteryDev

.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

@@ -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

@@ -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')

src/api/rest/profiles/v1/controller/profile.controller.ts

@@ -11,6 +11,7 @@ import { CommitmentController } from './commitments';
 import { AuthenticationController } from './auth';
 import { ContactController } from './contact';
 import { ThreadController } from './threads';
+import { ForumController } from './forum/v1/controller';
 
 @Module({
     imports: [InfrastructureModule, CQRSModule],
@@ -22,6 +23,7 @@ import { ThreadController } from './threads';
         CommitmentController,
         ThreadController,
         ContactController,
+        ForumController,
     ],
     providers: [CrowdActionService, ProfileService, AuthService],
     exports: [CrowdActionService, ProfileService, AuthService],

src/api/rest/rest.module.ts

@@ -7,10 +7,9 @@ import { CreateThreadDto, PaginatedThreadResponseDto } from '@infrastructure/thr
 import { PaginationDto } from '@infrastructure/pagination';
 import { AuthUser } from '@domain/auth/entity';
 import { ICQRSHandler } from '@common/cqrs';
-import { Identifiable } from '@domain/core';
+import { Identifiable, IPaginatedList } from '@domain/core';
 import { CreateThreadCommand } from '@modules/thread/cqrs/command';
 import { ListThreadsByForumQuery } from '@modules/thread';
-import { IPaginatedList } from '@domain/core';
 import { IThread } from '@domain/thread';
 
 @Controller('/v1/threads')

src/api/rest/threads/v1/controller/thread.controller.ts

@@ -0,0 +1,5 @@
+import { BlockBlobUploadResponse } from '@azure/storage-blob';
+
+export abstract class IBlobClientRepository {
+    abstract upload(params: any, imageName: string): Promise<BlockBlobUploadResponse>;
+}

src/core/blob-client.interface.ts

@@ -1,2 +1,2 @@
 export * from './repository.interface';
-export * from './s3-client.interface';
+export * from './blob-client.interface';