FIX: Ref Catalogo new functions models

package-lock.json

@@ -12,7 +12,7 @@
       "dependencies": {
         "@aws-sdk/client-secrets-manager": "^3.112.0",
         "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
-        "@dadosfera/protospack-v2": "3.18.10",
+        "@dadosfera/protospack-v2": "3.18.14",
         "@grpc/grpc-js": "^1.6.7",
         "@grpc/proto-loader": "^0.6.13",
         "@nestjs/common": "^8.4.7",
@@ -1726,9 +1726,9 @@
       }
     },
     "node_modules/@dadosfera/protospack-v2": {
-      "version": "3.18.10",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.18.10.tgz",
-      "integrity": "sha512-0bRUvo4p7cJJOL+B0hVTiSDaA2MGtirPkFVQW4lUfzsyY5vrsbAkMz6R3iPdPPwFSxGn5LwidHGkP3/l7hlEpA==",
+      "version": "3.18.14",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.18.14.tgz",
+      "integrity": "sha512-6SQDJgqxQbJtnZZ/ID52+x/fWA93P3LxebIwCaVZHQhwnRzIpxEHVcr9a07ytqQJMma9fezDWqnlPQCmKhEASg==",
       "dependencies": {
         "@grpc/grpc-js": "^1.6.7",
         "rxjs": "^7.5.5",
@@ -12306,9 +12306,9 @@
       }
     },
     "@dadosfera/protospack-v2": {
-      "version": "3.18.10",
-      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.18.10.tgz",
-      "integrity": "sha512-0bRUvo4p7cJJOL+B0hVTiSDaA2MGtirPkFVQW4lUfzsyY5vrsbAkMz6R3iPdPPwFSxGn5LwidHGkP3/l7hlEpA==",
+      "version": "3.18.14",
+      "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com:443/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.18.14.tgz",
+      "integrity": "sha512-6SQDJgqxQbJtnZZ/ID52+x/fWA93P3LxebIwCaVZHQhwnRzIpxEHVcr9a07ytqQJMma9fezDWqnlPQCmKhEASg==",
       "requires": {
         "@grpc/grpc-js": "^1.6.7",
         "rxjs": "^7.5.5",

package.json

@@ -10,6 +10,7 @@
   },
   "scripts": {
     "preinstall": "aws codeartifact login --tool npm --namespace @dadosfera --repository dadosfera-npm --domain dadosfera --domain-owner 611330257153 --region us-east-1",
+    "proto-update": "npm i @dadosfera/protospack-v2@latest --save-exact",
     "prebuild": "rimraf dist",
     "build": "nest build",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
@@ -27,7 +28,7 @@
   "dependencies": {
     "@aws-sdk/client-secrets-manager": "^3.112.0",
     "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
-    "@dadosfera/protospack-v2": "3.18.10",
+    "@dadosfera/protospack-v2": "3.18.14",
     "@grpc/grpc-js": "^1.6.7",
     "@grpc/proto-loader": "^0.6.13",
     "@nestjs/common": "^8.4.7",

src/modules/catalog/catalog.controller.ts

@@ -1,15 +1,15 @@
 import {
   Body,
   Controller,
-  Delete,
-  ForbiddenException,
   Get,
+  Headers,
   HttpException,
   Inject,
   Param,
   Post,
   Put,
   Query,
+  UnsupportedMediaTypeException,
 } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import {
@@ -21,6 +21,7 @@ import { CatalogService } from './catalog.service';
 import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
 import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
 import { RequestUser, User } from 'src/authentication/user.decorator';
+import { ICatalogAllResponse } from './dtos';
 
 @ApiTags('Catalog')
 @Controller('catalog')
@@ -56,54 +57,15 @@ export class CatalogController {
     this.logger = dadosferaLogger.logger;
   }
 
-  @Put('manage_permissions/:id')
-  async manageDataAssetPermissions(
-    @Param('id') id: string,
+  @Get()
+  async catalogAll(
     @User() user: RequestUser,
-    @Body() body,
-  ) {
-    const { customer_id, customer_name, user_id, username } = user;
-    const metadata = PackTheMetadata({
-      customer_id,
-      customer_name,
-      user_id,
-      username,
-    });
-    const response = await this.catalogService.managePermissions(
-      { ...body, id },
-      metadata,
-    );
-
-    return { data_asset: JSON.parse(response.data_asset) };
-  }
-
-  @Put('revoke_permissions/:id')
-  async revokeDataAssetPermissions(
-    @Param('id') id: string,
-    @User() user: RequestUser,
-    @Body() body,
-  ) {
-    const { customer_id, customer_name, user_id, username } = user;
-    const metadata = PackTheMetadata({
-      customer_id,
-      customer_name,
-      user_id,
-      username,
-    });
-    const response = await this.catalogService.revokePermissions(
-      { ...body, id },
-      metadata,
-    );
-
-    return { message: response.message };
-  }
-
-  @Get('all')
-  async catalogAll(@User() user: RequestUser, @Body() body, @Query() params) {
+    @Query() query,
+  ): Promise<ICatalogAllResponse> {
     const { user_id, customer_name, customer_id, username, permissions } = user;
-    this.logger.info(`/catalog - ON CATALOG ALL ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
+    this.logger.info(`/catalog - Catalog all data assets`, {
+      user_id,
+      customer_name,
     });
 
     const is_data_manager = permissions.includes(
@@ -122,337 +84,12 @@ export class CatalogController {
     });
 
     const res = await this.catalogService.getAllOpenSearchDataAssets(
-      params,
+      query,
       metadata,
       customer_id,
     );
 
-    return res.data_assets;
-  }
-
-  @Get('data_apps')
-  async dataAppsAll(@Body() body) {
-    this.logger.info(`/catalog - ON FIND ALL DATA APPS ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const res = await this.catalogService.dataAppsAll(body);
-
-    return res;
-  }
-
-  @Delete('data_apps/:id')
-  async dataAppsOne(@Param() params, @Body() body) {
-    this.logger.info(`/catalog - ON FIND ONE DATA APP ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-    const { id } = params;
-
-    const res = await this.catalogService.dataAppsOne(id, body);
-
-    return res;
-  }
-
-  @Get('dashboard-metabase/:id')
-  async getOneDashboardMetabase(
-    @Body() body,
-    @Param() params,
-    @User() user: RequestUser,
-  ) {
-    const { id } = params;
-    this.logger.info(`/catalog - ON GET ONE DASHBOARD METABASE ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const { username, user_id, customer_id, customer_name, permissions } = user;
-    const is_data_manager = permissions.includes(
-      PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER.seqid,
-    );
-    let has_permission = false;
-    const metadata = PackTheMetadata({
-      username,
-      user_id,
-      customer_id,
-      customer_name,
-    });
-
-    const user_roles = await this.catalogService.getUserRolesIds(user_id);
-
-    const res = await this.catalogService.getOneDashboardMetabase(
-      id,
-      body,
-      metadata,
-      customer_id,
-    );
-
-    const dashboard = res.dashboard;
-
-    if (dashboard.owner === username) has_permission = true;
-
-    for (const role of user_roles) {
-      if (dashboard.p_roles.includes(role)) has_permission = true;
-    }
-
-    if (dashboard.p_users.includes(user_id)) has_permission = true;
-
-    if (is_data_manager || has_permission) {
-      delete dashboard.p_roles;
-      delete dashboard.p_users;
-      return res;
-    }
-
-    throw new HttpException(
-      'You do not have permission to access this data asset.',
-      403,
-    );
-  }
-
-  @Get('table-metadata')
-  async getAllTableMetadata(
-    @Body() body,
-    @Query() query,
-    @User() user: RequestUser,
-  ) {
-    this.logger.info(`/catalog - ON GET ALL TABLES METADATA ROUTE`, {
-      user: user.user_id,
-      customer: user.customer_name,
-    });
-    const { user_id, customer_name, customer_id, permissions, username } = user;
-    const is_data_manager = permissions.includes(
-      PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER.seqid,
-    );
-    let has_permission = false;
-    const metadata = PackTheMetadata({
-      user_id,
-      customer_id,
-      customer_name,
-    });
-
-    if (!query) {
-      const res = await this.catalogService.getAllTableMetadata(body);
-      return res;
-    } else {
-      const user_roles = await this.catalogService.getUserRolesIds(user_id);
-      const res = await this.catalogService.getOneTableMetadata(
-        body,
-        query,
-        metadata,
-        customer_id,
-      );
-      const table = res[0];
-
-      if (table.owner === username) has_permission = true;
-
-      for (const role of user_roles) {
-        if (table.p_roles.includes(role)) has_permission = true;
-      }
-
-      if (table.p_users.includes(user_id)) has_permission = true;
-
-      if (is_data_manager || has_permission) {
-        delete table.p_roles;
-        delete table.p_users;
-        return res;
-      }
-
-      throw new ForbiddenException(
-        'You do not have permission to access this data asset.',
-      );
-    }
-  }
-
-  @Delete('table-metadata/:id')
-  async deleteOneTableMetadata(@Param() params, @Body() body) {
-    const { id } = params;
-    this.logger.info(`/catalog - ON DELETE ONE TABLE METADATA ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const res = await this.catalogService.deleteOneTableMetadata(id, body);
-
-    return res;
-  }
-
-  @Get('column-metadata')
-  async getOneColumnMetadata(@Body() body, @Query() params) {
-    this.logger.info(`/catalog - ON GET ONE COLUMN METADATA ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const res = await this.catalogService.getOneColumnMetadata(body, params);
-
-    return res;
-  }
-
-  @Delete('column-metadata/:id')
-  async deleteOneColumnMetadata(@Param() params, @Body() body) {
-    this.logger.info(`/catalog - ON DELETE ONE COLUMN METADATA ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-    const { id } = params;
-
-    const res = await this.catalogService.deleteOneColumnMetadata(id, body);
-
-    return res;
-  }
-
-  @Get('data-preview')
-  async getOneDataPreview(@Body() body, @Query() params) {
-    this.logger.info(`/catalog - ON GET ONE DATAPREVIEW ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const res = await this.catalogService.getOneDataPreview(body, params);
-
-    return res;
-  }
-
-  @Get('data-status')
-  async getDataStatus(@Body() body) {
-    this.logger.info(`/catalog - ON GET DATA STATUS ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const res = await this.catalogService.getDataStatus(body);
-
-    return res;
-  }
-
-  @Get('data-status')
-  async createDataStatus(@Body() body) {
-    this.logger.info(`/catalog - ON CREATE DATA STATUS ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const res = await this.catalogService.createDataStatus(body);
-
-    return res;
-  }
-
-  @Get('data-docs')
-  async getDataDocs(@Body() body) {
-    this.logger.info(`/catalog - ON GET DATA DOCS ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const res = await this.catalogService.getDataDocs(body);
-
-    return res;
-  }
-
-  @Post('data-docs')
-  async createDataDocs(@Body() body) {
-    this.logger.info(`/catalog - ON CREATE DATA DOCS ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const res = await this.catalogService.createDataDocs(body);
-
-    return res;
-  }
-
-  @Get('data-rating')
-  async getDataRating(@Body() body) {
-    this.logger.info(`/catalog - ON GET DATA RATING ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const res = await this.catalogService.getDataRating(body);
-
-    return res;
-  }
-
-  @Post('data-rating')
-  async createDataRating(@Body() body) {
-    this.logger.info(`/catalog - ON GET DATA RATING ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const res = await this.catalogService.createDataRating(body);
-
-    return res;
-  }
-
-  @Get('summary-rating/:id')
-  async getSummaryRating() {
-    this.logger.info(`/catalog - ON GET SUMMARY RATING ROUTE`);
-    //const { id } = params;
-
-    //
-
-    //const res = await this.catalogService.getSummaryRating(id, body);
-
-    return {
-      avg_rating: 0,
-      rating_count: 0,
-    };
-  }
-
-  @Get('data-comment')
-  async getDataComment(@Body() body) {
-    this.logger.info(`/catalog - ON GET DATA COMMENT ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const res = await this.catalogService.getDataComment(body);
-
-    return res;
-  }
-
-  @Post('data-comment')
-  async createDataComment(@Body() body) {
-    this.logger.info(`/catalog - ON GET DATA COMMENT ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const res = await this.catalogService.createDataComment(body);
-
-    return res;
-  }
-
-  @Get('data-review')
-  async getDataReview(@Body() body, @Query() params) {
-    this.logger.info(`/catalog - ON GET DATA REVIEW ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
-    });
-
-    const res = await this.catalogService.getDataReview(body, params);
-
-    return res;
-  }
-
-  @Post('tags')
-  async createTags(@Body() body, @User() user: RequestUser) {
-    this.logger.info(`/catalog - ON CREATE TAG ROUTE`, {
-      user: user.user_id,
-      customer: user.customer_name,
-    });
-    const { user_id, customer_name, customer_id } = user;
-    const metadata = PackTheMetadata({
-      user_id,
-      customer_id,
-      customer_name,
-    });
-
-    const res = await this.catalogService.createTags(body, metadata);
-
-    return res.data_assets;
+    return { ...res };
   }
 
   @Get('tags')
@@ -474,28 +111,251 @@ export class CatalogController {
     return res;
   }
 
-  @Get('table-rules')
-  async getTableRules(@Body() body) {
-    this.logger.info(`/catalog - ON GET TABLE RULES ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
+  @Get('data-asset/:id')
+  async getDataAsset(
+    @User() user: RequestUser,
+    @Headers() headers,
+    @Param('id') id,
+  ) {
+    const { username, user_id, customer_id, customer_name, permissions } = user;
+    const [data_asset_type, data_asset_id] = id.split('-');
+
+    this.logger.info(`/catalog - ON GET ONE DASHBOARD METABASE ROUTE`, {
+      username,
+      customer_name,
     });
 
-    const res = await this.catalogService.getTableRules(body);
+    const is_data_manager = permissions.includes(
+      PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER.seqid,
+    );
+    let has_permission = false;
+    const metadata = PackTheMetadata({
+      username,
+      user_id,
+      customer_id,
+      customer_name,
+    });
+
+    const user_roles = await this.catalogService.getUserRolesIds(user_id);
+
+    const { data_asset } = await this.catalogService.getOneDataAsset({
+      customer_id,
+      data_asset_id,
+      data_asset_type,
+      metadata,
+    });
+
+    if (data_asset?.owner === username) has_permission = true;
+
+    for (const role of user_roles) {
+      if (data_asset.p_roles.includes(role)) has_permission = true;
+    }
+
+    if (data_asset.p_users.includes(user_id)) has_permission = true;
+
+    if (is_data_manager || has_permission) {
+      delete data_asset.p_roles;
+      delete data_asset.p_users;
+      return { data_asset };
+    }
+
+    throw new HttpException(
+      'You do not have permission to access this data asset.',
+      403,
+    );
+  }
+
+  @Get('data-asset/:id/columns-metadata')
+  async getDataAssetColumnsMetadata(
+    @User() user: RequestUser,
+    @Headers('Dadosfera-Lang') language,
+    @Param('id') id,
+  ) {
+    const { customer_name, customer_id, user_id, username } = user;
+    const data_asset_type = id.split('-')[0];
+
+    const supported_data_assets = ['dataset'];
+
+    if (!supported_data_assets.includes(data_asset_type)) {
+      throw new UnsupportedMediaTypeException(
+        `${data_asset_type} does not have a preview function for the time being.`,
+      );
+    }
+
+    this.logger.info(`/catalog - ON GET DATA DOCS ROUTE`, {
+      user_id,
+      customer_name,
+    });
+
+    const metadata = PackTheMetadata({
+      customer_name,
+      customer_id,
+      user_id,
+      username,
+      language,
+    });
+
+    const columns_metadata =
+      await this.catalogService.getDatasetColumnsMetadata(id, metadata);
+
+    return { columns_metadata };
+  }
+
+  @Get('data-asset/:id/preview')
+  async getDataAssetPreview(
+    @User() user: RequestUser,
+    @Headers('Dadosfera-lang') language,
+    @Param('id') id,
+  ) {
+    const { customer_name, customer_id, user_id, username } = user;
+    const data_asset_type = id.split('-')[0];
+
+    const supported_data_assets = ['dataset'];
+
+    if (!supported_data_assets.includes(data_asset_type)) {
+      throw new UnsupportedMediaTypeException(
+        `${data_asset_type} does not have a preview function for the time being.`,
+      );
+    }
+
+    this.logger.info(`/catalog - ON GET DATA DOCS ROUTE`, {
+      user_id,
+      customer_name,
+    });
+
+    const metadata = PackTheMetadata({
+      customer_name,
+      customer_id,
+      user_id,
+      username,
+      language,
+    });
+
+    const preview = await this.catalogService.getDatasetPreview(id, metadata);
+
+    return { preview };
+  }
+
+  @Get('data-asset/:id/docs')
+  async getDataAssetDocs(
+    @User() user: RequestUser,
+    @Headers('Dadosfera-Lang') language,
+    @Param('id') id,
+  ) {
+    const { customer_name, customer_id, user_id, username } = user;
+    const data_asset_type = id.split('-')[0];
+
+    const supported_data_assets = ['dataset'];
+
+    if (!supported_data_assets.includes(data_asset_type)) {
+      throw new UnsupportedMediaTypeException(
+        `${data_asset_type} does not have a documentation function for the time being.`,
+      );
+    }
+
+    this.logger.info(`/catalog - ON GET DATA DOCS ROUTE`, {
+      user_id,
+      customer_name,
+    });
+
+    const metadata = PackTheMetadata({
+      customer_name,
+      customer_id,
+      user_id,
+      username,
+      language,
+    });
+
+    const docs = await this.catalogService.getDataDocs(id, metadata);
+
+    return { docs };
+  }
+
+  @Put('data-asset/:id')
+  async updateDataAsset(
+    @User() user: RequestUser,
+    @Headers() headers,
+    @Param('id') id,
+  ) {
+    console.log(user, headers);
+    return { data_asset_id: id, message: 'Under development' };
+  }
+
+  @Post('data-asset/:id/docs')
+  async manageDataAssetDocs(
+    @User() user: RequestUser,
+    @Headers() headers,
+    @Param('id') data_asset_id,
+    @Body('docs') docs: string,
+  ) {
+    const { user_id, customer_name } = user;
+    const [data_asset_type, id] = data_asset_id.split('-');
+
+    this.logger.info(`/catalog - ON GET DATA DOCS ROUTE`, {
+      user_id,
+      customer_name,
+    });
+
+    const res = await this.catalogService.createDataDocs({
+      table_id: id,
+      docs,
+      info: {
+        customer: customer_name,
+      },
+    });
 
     return res;
   }
 
-  @Delete('table-rules/:id')
-  async deleteTableRules(@Param() params, @Body() body) {
-    this.logger.info(`/catalog - ON DELETE TABLE RULES ROUTE`, {
-      user: body.info.user_id,
-      customer: body.info.customer,
+  @Post('data-asset/:id/comment')
+  async makeAComment(
+    @User() user: RequestUser,
+    @Headers() headers,
+    @Param('id') id,
+  ) {
+    console.log(user, headers);
+    return { data_asset_id: id, message: 'Under development' };
+  }
+
+  @Put('data-asset/:id/manage-permissions')
+  async manageDataAssetPermissions(
+    @Param('id') id: string,
+    @User() user: RequestUser,
+    @Body() body,
+  ) {
+    const { customer_id, customer_name, user_id, username } = user;
+    const metadata = PackTheMetadata({
+      customer_id,
+      customer_name,
+      user_id,
+      username,
     });
-    const { id } = params;
+    const response = await this.catalogService.managePermissions(
+      { ...body, id },
+      metadata,
+    );
 
-    const res = await this.catalogService.deleteTableRules(id, body);
+    return { data_asset: JSON.parse(response.data_asset) };
+  }
 
-    return res;
+  @Put('data-asset/:id/revoke-permissions')
+  async revokeDataAssetPermissions(
+    @Param('id') id: string,
+    @User() user: RequestUser,
+    @Body() body,
+  ) {
+    const { customer_id, customer_name, user_id, username } = user;
+    const metadata = PackTheMetadata({
+      customer_id,
+      customer_name,
+      user_id,
+      username,
+    });
+    const response = await this.catalogService.revokePermissions(
+      { ...body, id },
+      metadata,
+    );
+
+    return { message: response.message };
   }
 }

src/modules/catalog/catalog.service.ts

@@ -15,6 +15,8 @@ import { lastValueFrom } from 'rxjs';
 import { CatalogClientConfiguration } from './catalog-client';
 import { UsersService } from '../users/users.service';
 import { RolesService } from '../roles/roles.service';
+import { Metadata } from '@grpc/grpc-js';
+import { Catalog } from '@dadosfera/protospack-v2';
 
 class CatalogService implements OnModuleInit {
   catalogReadService: ReadService.CatalogReadServices;
@@ -81,28 +83,6 @@ class CatalogService implements OnModuleInit {
     });
   }
 
-  async catalogAll(body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(`${nimbusUrl}/api/catalog/all/`);
-
-    return data;
-  }
-
-  async dataAppsAll(body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data_apps/`);
-    return data;
-  }
-
-  async dataAppsOne(id, body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(
-      `${nimbusUrl}/api/catalog/data_apps/${id}/`,
-    );
-
-    return data;
-  }
-
   async getUserRolesIds(userId: string) {
     const result = await this.userService.findOneById(userId).catch(() => null);
 
@@ -153,12 +133,12 @@ class CatalogService implements OnModuleInit {
       );
     });
 
-    const data_assets = JSON.parse(response.data_assets);
+    const result = JSON.parse(response.data_assets);
 
     const [customer_users, customer_roles] =
       await this.getUsernamesAndRolesByCustomerId(customer_id);
 
-    for (const asset of data_assets.tables) {
+    for (const asset of result.data_assets) {
       const condition =
         asset.owner && !asset.owner.includes('@') ? true : false;
       const result = condition
@@ -190,50 +170,18 @@ class CatalogService implements OnModuleInit {
       });
     }
 
-    for (const asset of data_assets.dashboards) {
-      const condition =
-        asset.owner && !asset.owner.includes('@') ? true : false;
-      const result = condition
-        ? await this.userService.findOneById(asset.owner).catch(() => null)
-        : null;
-
-      const owner = result !== null ? result.user.username : null;
-
-      const roles = [];
-      const users = [];
-
-      for (const role of customer_roles) {
-        for (const role_id of asset.roles) {
-          if (role.id === role_id) roles.push(role);
-        }
-      }
-
-      for (const user of customer_users) {
-        for (const user_id of asset.users) {
-          if (user.id === user_id) users.push(user);
-        }
-      }
-
-      Object.assign(asset, {
-        ...asset,
-        owner,
-        roles,
-        users,
-      });
-    }
-
-    return { data_assets };
+    return { data_assets: result.data_assets };
   }
 
-  async getOneDashboardMetabase(id, body, metadata, customer_id) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(
-      `${nimbusUrl}/api/catalog/dashboard-metabase/${id}`,
-    );
-
+  async getOneDataAsset({
+    data_asset_id,
+    data_asset_type,
+    customer_id,
+    metadata,
+  }) {
     const { data_asset } = await lastValueFrom(
       this.catalogReadService.GetOneDataAsset(
-        { id, type: 'dashboard' },
+        { id: data_asset_id, type: data_asset_type },
         metadata,
       ),
     );
@@ -265,9 +213,7 @@ class CatalogService implements OnModuleInit {
       }
     }
 
-    Object.assign(data.dashboard, {
-      tags: opensearchTable.tags,
-      description: opensearchTable.description || null,
+    Object.assign(opensearchTable, {
       p_roles: opensearchTable.roles,
       p_users: opensearchTable.users,
       roles,
@@ -275,125 +221,47 @@ class CatalogService implements OnModuleInit {
       owner,
     });
 
-    return data;
+    return { data_asset: opensearchTable };
   }
 
-  async getAllTableMetadata(body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(
-      `${nimbusUrl}/api/catalog/table-metadata/`,
+  async getDataDocs(data_asset_id: string, metadata: Metadata) {
+    const [data_asset_type, id] = data_asset_id.split('-');
+
+    const { documentation } = await lastValueFrom(
+      this.catalogReadService.GetDatasetDoc(
+        { id, type: data_asset_type },
+        metadata,
+      ),
     );
-    return data;
+    console.log(documentation);
+    const docs = JSON.parse(documentation);
+    return docs;
   }
 
-  async getOneTableMetadata(body, params, metadata, customer_id) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(
-      `${nimbusUrl}/api/catalog/table-metadata/`,
-      { params: params },
+  async getDatasetPreview(data_asset_id: string, metadata: Metadata) {
+    const [data_asset_type, id] = data_asset_id.split('-');
+
+    const { preview } = await lastValueFrom(
+      this.catalogReadService.GetDatasetPreview(
+        { id, type: data_asset_type },
+        metadata,
+      ),
     );
-    if (data?.length === 1) {
-      const { data_asset } = await lastValueFrom(
-        this.catalogReadService.GetOneDataAsset(
-          { id: data[0].id, type: 'dataset' },
-          metadata,
-        ),
-      );
-      const opensearchTable = JSON.parse(data_asset);
-      const result = opensearchTable.owner
-        ? await this.userService
-            .findOneById(opensearchTable.owner)
-            .catch(() => null)
-        : null;
-
-      const owner = result !== null ? result.user.username : null;
-
-      const [customer_users, customer_roles] =
-        await this.getUsernamesAndRolesByCustomerId(customer_id);
-
-      const users = [];
-      const roles = [];
-
-      for (const role of customer_roles) {
-        for (const role_id of opensearchTable.roles) {
-          if (role.id === role_id) roles.push(role);
-        }
-      }
-
-      for (const user of customer_users) {
-        for (const user_id of opensearchTable.users) {
-          if (user.id === user_id) users.push(user);
-        }
-      }
-
-      return [
-        {
-          ...data[0],
-          tags: opensearchTable.tags,
-          table_description: opensearchTable.description,
-          p_roles: opensearchTable.roles,
-          p_users: opensearchTable.users,
-          users,
-          roles,
-          owner,
-        },
-      ];
-    }
-    return data;
+    const result = JSON.parse(preview);
+    return result;
   }
 
-  async deleteOneTableMetadata(id, body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.delete(
-      `${nimbusUrl}/api/catalog/table-metadata/${id}`,
+  async getDatasetColumnsMetadata(data_asset_id: string, metadata: Metadata) {
+    const [data_asset_type, id] = data_asset_id.split('-');
+
+    const { columns_metadata } = await lastValueFrom(
+      this.catalogReadService.GetDatasetColumnsMetadata(
+        { id, type: data_asset_type },
+        metadata,
+      ),
     );
-    return data;
-  }
-
-  async getOneColumnMetadata(body, params) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(
-      `${nimbusUrl}/api/catalog/column-metadata/`,
-      { params: params },
-    );
-    return data;
-  }
-
-  async deleteOneColumnMetadata(id, body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.delete(
-      `${nimbusUrl}/api/catalog/column-metadata/${id}/`,
-    );
-    return data;
-  }
-
-  async getOneDataPreview(body, params) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-preview/`, {
-      params: params,
-    });
-    return data;
-  }
-
-  async getDataStatus(body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-status/`);
-    return data;
-  }
-
-  async createDataStatus(body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.post(
-      `${nimbusUrl}/api/catalog/data-status/`,
-      body,
-    );
-    return data;
-  }
-
-  async getDataDocs(body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-docs/`);
-    return data;
+    const result = JSON.parse(columns_metadata);
+    return result;
   }
 
   async createDataDocs(body) {
@@ -405,70 +273,6 @@ class CatalogService implements OnModuleInit {
     return data;
   }
 
-  async getDataRating(body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-rating/`);
-    return data;
-  }
-
-  async createDataRating(body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.post(
-      `${nimbusUrl}/api/catalog/data-rating/`,
-      body,
-    );
-    return data;
-  }
-
-  async getSummaryRating(id, body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(
-      `${nimbusUrl}/api/catalog/summary-rating/${id}`,
-    );
-    return data;
-  }
-
-  async getDataComment(body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-comment/`);
-    return data;
-  }
-
-  async createDataComment(body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.post(
-      `${nimbusUrl}/api/catalog/data-comment/`,
-      body,
-    );
-    return data;
-  }
-
-  async getDataReview(body, params) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(`${nimbusUrl}/api/catalog/data-review/`, {
-      params: params,
-    });
-    return data;
-  }
-
-  async createTags(data: Messages.TagTableRequest, metadata) {
-    this.logger.info('CatalogService - createTags');
-
-    const response = await lastValueFrom(
-      this.catalogWriteService.TagTable(data, metadata),
-    )
-      .then((res) => {
-        this.logger.info('Done');
-        return res;
-      })
-      .catch((err) => {
-        this.logger.error(err.message);
-        throw new Error(err);
-      });
-
-    return { data_assets: response };
-  }
-
   async findAllTags(data, metadata) {
     this.logger.info('CatalogService - findAllCustomerTags');
 
@@ -486,23 +290,6 @@ class CatalogService implements OnModuleInit {
 
     return response;
   }
-
-  async getTableRules(body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.get(
-      `${nimbusUrl}/api/catalog/table-rules/`,
-      body,
-    );
-    return data;
-  }
-
-  async deleteTableRules(id, body) {
-    const nimbusUrl = this._getNimbusUrl(body);
-    const { data } = await axios.delete(
-      `${nimbusUrl}/api/catalog/table-rules/${id}`,
-    );
-    return data;
-  }
 }
 
 export { CatalogService };

src/modules/catalog/dtos/index.ts

@@ -0,0 +1,78 @@
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+
+export class IRole {
+  @ApiProperty()
+  name: string;
+  @ApiProperty()
+  id: string;
+}
+
+export class IUser {
+  @ApiProperty()
+  username: string;
+  @ApiProperty()
+  id: string;
+}
+
+export class IDataAsset {
+  @ApiProperty()
+  id: number;
+  @ApiPropertyOptional()
+  database_name?: string;
+  @ApiPropertyOptional()
+  table_name?: string;
+  @ApiPropertyOptional()
+  num_columns?: number;
+  @ApiPropertyOptional()
+  location?: string;
+  @ApiPropertyOptional()
+  created_time?: string;
+  @ApiPropertyOptional()
+  table_type?: string;
+  @ApiPropertyOptional()
+  size_in_bytes?: number;
+  @ApiPropertyOptional()
+  num_files?: number;
+  @ApiPropertyOptional()
+  data_encrypted?: string;
+  @ApiPropertyOptional()
+  num_rows?: number;
+  @ApiPropertyOptional()
+  display_name?: string;
+  @ApiProperty()
+  pipeline_id: string;
+  @ApiProperty()
+  user_id: string;
+  @ApiProperty()
+  description: string;
+  @ApiProperty()
+  data_asset_type: string;
+  @ApiProperty()
+  tags: string[];
+  @ApiProperty()
+  owner: {
+    username: string;
+    id: string;
+  };
+  @ApiProperty()
+  roles: IRole[];
+  @ApiProperty()
+  users: IUser[];
+  @ApiPropertyOptional()
+  dashboard_id?: number;
+  @ApiPropertyOptional()
+  name?: string;
+  @ApiPropertyOptional()
+  parameters?: string[];
+  @ApiPropertyOptional()
+  embedding_params?: object;
+  @ApiPropertyOptional()
+  created_at?: string;
+  @ApiPropertyOptional()
+  updated_at?: string;
+}
+
+export class ICatalogAllResponse {
+  @ApiProperty()
+  data_assets: IDataAsset[];
+}

src/modules/oauth/oauth.controller.ts

@@ -5,7 +5,6 @@ import { ConnectionClientService } from '../connection/client.service';
 import jwt from 'jsonwebtoken';
 import DadosferaLogger from '@dadosfera/dadosfera-logs/dist';
 import { PackTheMetadata } from 'src/utils/ PackTheMetadata';
-import { Authenticated } from 'src/authentication/authentication.decorator';
 @ApiTags('oauth')
 @Controller('oauth')
 export class OauthController {