Merge branch 'main' into feat/rest-api

src/main.ts

@@ -7,6 +7,7 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { AppModule } from './app.module';
 import { writeFileSync } from 'fs';
 import { execSync } from 'child_process';
+import { INestApplication } from '@nestjs/common';
 async function bootstrap() {
   DadosferaLogger.setupLogger({
     serviceName: 'maestro',
@@ -25,23 +26,29 @@ async function bootstrap() {
   });
 
   app.use(helmet());
+  configureSwagger(app);
 
+  await app.listen(3333);
+}
+function configureSwagger(app: INestApplication) {
   const date = new Date();
-  let swaggerVersion = `${date.getDate()}.${
+  const swaggerVersion = `${date.getDate()}.${
     date.getMonth() + 1
   }.${date.getFullYear()} - ${date.getHours()}:${date.getMinutes()}`;
 
+  let branchName = '';
   try {
-    const branchName = execSync('git rev-parse --abbrev-ref HEAD')
+    branchName = execSync('git rev-parse --abbrev-ref HEAD')
       .toString()
-      .replace('\n', '');
-    swaggerVersion = branchName;
+      .replace('\n', '')
+      .trim();
   } catch (error) {
     console.log("Can't get branch name", error);
   }
+  const swaggerTitle = branchName ? `Maestro - ${branchName}` : 'Maestro';
 
   const config = new DocumentBuilder()
-    .setTitle('Maestro')
+    .setTitle(swaggerTitle)
     .setDescription('Documentation for Maestro gateway')
     .setVersion(swaggerVersion)
     .addBearerAuth(
@@ -66,7 +73,5 @@ async function bootstrap() {
       2,
     ),
   );
-
-  await app.listen(3333);
 }
 bootstrap();

src/modules/catalog/catalog.controller.ts

@@ -25,6 +25,7 @@ import { RequestUser, User } from 'src/authentication/user.decorator';
 import {
   ICatalogAllResponse,
   IColumnsMetadataResponse,
+  ICreateDataAsset,
   IDeleteComment,
   IDocsResponse,
   IMakeAComment,
@@ -438,6 +439,26 @@ export class CatalogController {
     return { message: response.message };
   }
 
+  @Post()
+  async createDataAsset(
+    @User() user: RequestUser,
+    @Body() body: ICreateDataAsset,
+  ) {
+    const { customer_id, customer_name, user_id, username } = user;
+    const metadata = PackTheMetadata({
+      customer_id,
+      customer_name,
+      user_id,
+      username,
+    });
+    const { data_asset } = await this.catalogService.createDataAsset(
+      body,
+      metadata,
+    );
+
+    return { data_asset: JSON.parse(data_asset) };
+  }
+
   @Post('data-asset/:id/comment')
   async commentOnDataAsset(
     @Param('id') id: string,

src/modules/catalog/catalog.service.ts

@@ -58,6 +58,19 @@ class CatalogService implements OnModuleInit {
     )}.dadosfera.ai`;
   }
 
+  async createDataAsset(data: Messages.CreateDataAssetRequest, metadata) {
+    this.logger.info('CatalogService - Manage Data assets permissions');
+
+    return lastValueFrom(
+      this.catalogWriteService.CreateDataAsset(data, metadata),
+    ).catch((err) => {
+      throw new HttpException(
+        err.details,
+        err.code === 6 ? HttpStatus.CONFLICT : 404,
+      );
+    });
+  }
+
   async managePermissions(data: Messages.ManagePermissionRequest, metadata) {
     this.logger.info('CatalogService - Manage Data assets permissions');
 
@@ -275,7 +288,7 @@ class CatalogService implements OnModuleInit {
   async updateOneDataAsset({ data_asset_id, customer_id, body, metadata }) {
     const { data_asset } = await lastValueFrom(
       this.catalogWriteService.UpdateDataAsset(
-        { id: data_asset_id, ...body },
+        { id: data_asset_id, changes: JSON.stringify(body) },
         metadata,
       ),
     );

src/modules/catalog/dtos/index.ts

@@ -1,4 +1,5 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { CreateDataAssetRequest } from '@dadosfera/protospack-v2/dist/lib/Catalog/interfaces/messages';
 
 export class IRole {
   @ApiProperty()
@@ -128,6 +129,19 @@ export class IUpdateDataRequest {
   tags: string[];
 }
 
+export class ICreateDataAsset implements CreateDataAssetRequest {
+  @ApiProperty()
+  display_name: string;
+  @ApiProperty()
+  description: string;
+  @ApiProperty()
+  data_asset_type: string;
+  @ApiProperty()
+  external_url: string;
+  @ApiProperty()
+  location: string;
+}
+
 export class IPreview {
   @ApiProperty()
   id: string;