FIX: Conflit resolution

src/modules/catalog/catalog.controller.ts

@@ -423,6 +423,7 @@ export class CatalogController {
     @User() user: RequestUser,
     @Language() language: LanguageEnum,
     @Param('id') id: string,
+    @Query('asset_type') asset_type: string,
   ): Promise<IDocsResponse> {
     const { customer_name, customer_id, user_id, username } = user;
 
@@ -439,7 +440,7 @@ export class CatalogController {
       language,
     });
 
-    const docs = await this.catalogService.getDataDocs(id, metadata);
+    const docs = await this.catalogService.getDataDocs(id, asset_type, metadata);
 
     return { docs };
   }
@@ -487,21 +488,32 @@ export class CatalogController {
     @Headers() headers,
     @Param('id') table_id: string,
     @Body('docs') docs: string,
+    @Query('asset_type') asset_type: string,
   ) {
-    const { user_id, customer_name } = user;
+    const { user_id, customer_name, customer_id, username } = user;
+    
+    const metadata = PackTheMetadata({
+      customer_id,
+      customer_name,
+      user_id,
+      username,
+    });
 
-    this.logger.info(`/catalog - ON GET DATA DOCS ROUTE`, {
+    this.logger.info(`/catalog - ON POST DATA DOCS ROUTE`, {
       user_id,
       customer_name,
     });
 
-    const res = await this.catalogService.createDataDocs({
+    const body = {
       table_id,
       docs,
+      asset_type,
       info: {
         customer: customer_name,
       },
-    });
+    }
+
+    const res = await this.catalogService.createDataDocs(body, metadata);
 
     return res;
   }

src/modules/catalog/catalog.service.ts

@@ -24,9 +24,11 @@ import { CatalogClientConfiguration } from './catalog-client';
 import { UsersService } from '../users/users.service';
 import { RolesService } from '../roles/roles.service';
 import { Metadata } from '@grpc/grpc-js';
+import { PackTheMetadata } from 'src/utils/PackTheMetadata';
 import {
   AssetReporter,
   BatchRemoveRlsRulesRequest,
+  CreateDataDocsDTO,
   IUpdateDataRequest,
   TriggerCatalogReq,
 } from './dtos';
@@ -446,10 +448,9 @@ class CatalogService implements OnModuleInit {
     return { data_asset: asset[0] };
   }
 
-
-  async getDataDocs(id: string, metadata: Metadata) {
+  async getDataDocs(id: string, assetType: string, metadata: Metadata) {
     const { documentation } = await lastValueFrom(
-      this.catalogReadService.GetDatasetDoc({ id, type: undefined }, metadata),
+      this.catalogReadService.GetDatasetDoc({ id }, metadata),
     );
  
     const docs = JSON.parse(documentation);
@@ -480,8 +481,16 @@ class CatalogService implements OnModuleInit {
     return result;
   }
 
+  async createDataDocs(body: CreateDataDocsDTO, metadata: Metadata) {
+    if (body.asset_type === 'table' || body.asset_type === 'view') {
+      return this.createDataDocsViaNimbus(body);
+    }
+    
+    return this.createDataDocsViaGrpc(body, metadata);
+  }
 
-  async createDataDocs(body) {
+  private async createDataDocsViaNimbus(body: CreateDataDocsDTO) {
+    this.logger.info('Creating data docs via Nimbus for table/view');
     const nimbusUrl = this._getNimbusUrl(body);
     const { data } = await axios.post(
       `${nimbusUrl}/api/catalog/data-docs/`,
@@ -491,6 +500,30 @@ class CatalogService implements OnModuleInit {
   }
 
 
+  private async createDataDocsViaGrpc(body: CreateDataDocsDTO, metadata: Metadata) {
+    this.logger.info('Creating data docs via gRPC for other asset types');
+    try {
+      const response: any = await lastValueFrom(
+        this.catalogWriteService.UpdateDataAssetDoc(
+          {
+            id: body.table_id,
+            docs: body.docs,
+          },
+          metadata,
+        ),
+      );
+      
+      return response;
+      
+    } catch (error) {
+      this.logger.error('Error creating data asset docs:', error);
+      throw new HttpException(
+        'Failed to create data asset documentation',
+        HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+  }
+
   async findAllTags(data, metadata) {
     this.logger.info('CatalogService - findAllCustomerTags');
 

src/modules/catalog/dtos/index.ts

@@ -346,3 +346,10 @@ export type AssetReporter = {
   created_at: string;
   tags: string;
 }
+
+export type CreateDataDocsDTO = {
+  table_id: string;
+  docs: string;
+  asset_type: string;
+
+}

src/modules/catalog/share/share.service.ts

@@ -160,7 +160,7 @@ export class ShareService implements OnModuleInit {
     });
 
     const { documentation } = await lastValueFrom(
-      this.catalogReadService.GetDatasetDoc({ id, type: undefined }, metadata),
+      this.catalogReadService.GetDatasetDoc({ id }, metadata),
     );
     console.log(documentation);
     const docs = JSON.parse(documentation);