refactor: some minor changes

.env.dev

@@ -26,8 +26,8 @@ MINIO_ACCESS_KEY=minio
 MINIO_SECRET_KEY=12345678
 MINIO_USE_SSL=false
 MINIO_PORT=9000
-MINIO_BUCKET_NAME_PUBLIC=experience.private
-MINIO_BUCKET_NAME_PRIVATE=experience.public
+MINIO_PUBLIC_BUCKET=experience.private
+MINIO_PRIVATE_BUCKET=experience.public
 MINIO_REGION=us-east-1
 FILESYSTEM_DEFAULT=minio
 

.env.prod

@@ -25,8 +25,8 @@ MINIO_SECRET_KEY=12345678
 MINIO_USE_SSL=false
 MINIO_PORT=9000
 MINIO_REGION=us-east-1
-MINIO_BUCKET_NAME_PUBLIC=experience.public
-MINIO_BUCKET_NAME_PRIVATE=experience.private
+MINIO_PUBLIC_BUCKET=experience.public
+MINIO_PRIVATE_BUCKET=experience.private
 FILESYSTEM_DEFAULT=minio
 
 TZ=UTC

config/custom-environment-variables.json

@@ -47,8 +47,8 @@
       "useSSL": "MINIO_USE_SSL",
       "port": "MINIO_PORT",
       "region": "MINIO_REGION",
-      "bucketPublic": "MINIO_BUCKET_NAME_PUBLIC",
-      "bucketPrivate": "MINIO_BUCKET_NAME_PRIVATE"
+      "publicBucket": "MINIO_PUBLIC_BUCKET",
+      "privateBucket": "MINIO_PRIVATE_BUCKET"
     },
     "local": "",
     "default": "FILESYSTEM_DEFAULT"

config/development.json

@@ -49,8 +49,8 @@
       "useSSL": false,
       "port": 9000,
       "region": "us-east-1",
-      "bucketPublic": "experience",
-      "bucketPrivate": "experience"
+      "publicBucket": "experience",
+      "privateBucket": "experience"
     },
     "local": {
       "type": "local"

config/production.json

@@ -50,8 +50,8 @@
       "useSSL": false,
       "port": 9000,
       "region": "us-east-1",
-      "bucketPublic": "experience",
-      "bucketPrivate": "experience"
+      "publicBucket": "experience",
+      "privateBucket": "experience"
     },
     "local": {
       "type": "local"

config/test.json

@@ -63,8 +63,8 @@
       "useSSL": false,
       "port": 9000,
       "region": "us-east-1",
-      "bucketPublic": "experience.public",
-      "bucketPrivate": "experience.private"
+      "publicBucket": "experience.public",
+      "privateBucket": "experience.private"
     },
     "local": {
       "type": "local"

dev.init.sh

@@ -5,4 +5,4 @@ yarn command addUserRole --role SuperAdmin --email [email protected] --firstNa
 yarn command activeUser --email [email protected]
 yarn command activeUser --email [email protected]
 yarn command syncRolesPermission
-yarn command createBucket --bucketName experience --region us-east-1
+yarn command createBucket --name experience --region us-east-1

docs/coming_soon.md

@@ -22,7 +22,7 @@ Bash dev.init.sh Content
 npx ts-node src/command.ts addUserRole --role Admin --email [email protected] --firstName node --lastName node --password 12345678 --documentType DNI --documentNumber 12345678 --gender male --phone 541112345678 --country AR --address av.1234 --isSuperAdmin false --birthday 04/07/1990
 npx ts-node src/command.ts addUserRole --role SuperAdmin --email [email protected] --firstName super --lastName admin --documentType DNI --documentNumber 12345679 --gender male --phone 541112345678 --country AR --address av.1234 --password 12345678 --birthday 05/07/1990 --isSuperAdmin true
 npx ts-node src/command.ts syncRolesPermission
-npx ts-node src/command.ts createBucket --bucketName experience --region us-east-1
+npx ts-node src/command.ts createBucket --name experience --region us-east-1
 ```
 
 Create Push Notifications Keys
@@ -122,5 +122,5 @@ To change from Mongoose to TypeORM the following steps must be followed:
  * ```npx ts-node src/command.ts addUserRole --role Admin --email [email protected] --firstName node --lastName node --password 12345678 --isSuperAdmin false```
  * ```npx ts-node src/command.ts addUserRole --role SuperAdmin --email [email protected] --firstName super --lastName admin --password 12345678 --isSuperAdmin true```
  * ```npx ts-node src/command.ts syncRolesPermission```
- * ```npx ts-node src/command.ts createBucket --bucketName experience --region us-east-1```
+ * ```npx ts-node src/command.ts createBucket --name experience --region us-east-1```
  * ```npx ts-node src/command.ts createVapID```

docs/quick_start.md

@@ -24,7 +24,7 @@ Remember to generate the .env file for the system environment variables. You can
 yarn command addUserRole --role Admin --email [email protected] --firstName node --lastName node --password 12345678 --documentType DNI --documentNumber 12345678 --gender male --phone 541112345678 --country AR --address av.1234 --isSuperAdmin false --birthday 04/07/1990
 yarn command addUserRole --role SuperAdmin --email [email protected] --firstName super --lastName admin --documentType DNI --documentNumber 12345679 --gender male --phone 541112345678 --country AR --address av.1234 --password 12345678 --birthday 05/07/1990 --isSuperAdmin true
 yarn command syncRolesPermission
-yarn command createBucket --bucketName experience --region us-east-1
+yarn command createBucket --name experience --region us-east-1
 ```
 
 ## Create Push Notifications Keys

src/App/Presentation/Shared/Express/Responder.ts

@@ -7,7 +7,7 @@ import {
     Transformer
 } from '@digichanges/shared-experience';
 import { TYPES } from '../../../../Config/Injects/types';
-import IFileDTO from '../../../../File/InterfaceAdapters/Payloads/IFileDTO';
+import IFileDTO from '../../../../File/Domain/Payloads/IFileDTO';
 import IFormatResponder from '../../../../Shared/InterfaceAdapters/IFormatResponder';
 
 @injectable()

src/App/Presentation/Shared/Koa/Responder.ts

@@ -2,7 +2,7 @@ import Koa from 'koa';
 import { IHttpStatusCode, IPaginator, PaginatorTransformer, Transformer } from '@digichanges/shared-experience';
 
 import IFormatResponder from '../../../../Shared/InterfaceAdapters/IFormatResponder';
-import IFileDTO from '../../../../File/InterfaceAdapters/Payloads/IFileDTO';
+import IFileDTO from '../../../../File/Domain/Payloads/IFileDTO';
 import FormatResponder from '../FormatResponder';
 import FormatError from '../FormatError';
 import ErrorHttpException from '../ErrorHttpException';

src/App/Presentation/Transformers/BaseTransformer.ts

@@ -0,0 +1,7 @@
+
+export type BasePropertiesTransformer = { id: string, createdAt: number, updatedAt: number };
+type OmitPropertiesTransformer = 'createdAt' | 'updatedAt';
+
+type BaseTransformer<T> = Partial<Omit<T, OmitPropertiesTransformer>>;
+
+export default BaseTransformer;

src/Config/mainConfig.ts

@@ -54,8 +54,8 @@ export type MinioConfig = {
     useSSL: boolean;
     port: number;
     region: string;
-    bucketPublic: string;
-    bucketPrivate: string;
+    publicBucket: string;
+    privateBucket: string;
 };
 
 type JwtConfig = {

src/File/Domain/Entities/File.ts

@@ -1,4 +1,4 @@
-import IFileDomain from '../../InterfaceAdapters/IFileDomain';
+import IFileDomain from './IFileDomain';
 import Base from '../../../App/Domain/Entities/Base';
 
 class File extends Base implements IFileDomain
@@ -12,20 +12,20 @@ class File extends Base implements IFileDomain
     version: number;
     isPublic: boolean;
 
-    constructor({ originalName = 'empty.jpg', isOriginalName = false })
+    constructor({ originalName = 'empty.jpg', hasOriginalName = false })
     {
         super();
         this.version = 1;
         this.isPublic = false;
         this.originalName = originalName;
-        this.setName(isOriginalName);
+        this.setName(hasOriginalName);
     }
 
-    private setName(isOriginalName: boolean)
+    private setName(hasOriginalName: boolean)
     {
         this.name = this._id;
 
-        if (isOriginalName)
+        if (hasOriginalName)
         {
             this.name = this.originalName
                 .toLowerCase()

src/File/InterfaceAdapters/IFileDomain.ts → src/File/Domain/Entities/IFileDomain.ts

@@ -1,4 +1,4 @@
-import IBaseDomain from '../../App/InterfaceAdapters/IBaseDomain';
+import IBaseDomain from '../../../App/InterfaceAdapters/IBaseDomain';
 
 interface IFileDomain extends IBaseDomain
 {

src/File/Domain/Payloads/CreateBucketPayload.ts

@@ -0,0 +1,10 @@
+
+interface CreateBucketPayload
+{
+    getName(): string;
+    getRegion(): string;
+    getPublicBucketPolicy(): string;
+    getPrivateBucketPolicy(): string;
+}
+
+export default CreateBucketPayload;

src/File/InterfaceAdapters/Payloads/FileDTO.ts → src/File/Domain/Payloads/FileDTO.ts

@@ -1,5 +1,5 @@
 import internal from 'stream';
-import IFileDomain from '../IFileDomain';
+import IFileDomain from '../Entities/IFileDomain';
 import IFileDTO from './IFileDTO';
 
 class FileDTO implements IFileDTO

src/File/InterfaceAdapters/Payloads/IFileDTO.ts → src/File/Domain/Payloads/IFileDTO.ts

@@ -1,5 +1,5 @@
 import internal from 'stream';
-import IFileDomain from '../IFileDomain';
+import IFileDomain from '../Entities/IFileDomain';
 
 interface IFileDTO
 {

src/File/Domain/Services/FileService.ts

@@ -1,18 +1,18 @@
-import IFileDomain from '../../InterfaceAdapters/IFileDomain';
+import IFileDomain from '../Entities/IFileDomain';
 import FilesystemFactory from '../../../Shared/Factories/FilesystemFactory';
 import { containerFactory } from '../../../Shared/Decorators/ContainerFactory';
 import { REPOSITORIES } from '../../../Config/Injects/repositories';
-import IFileRepository from '../../InterfaceAdapters/IFileRepository';
-import PresignedFileRepPayload from 'File/InterfaceAdapters/Payloads/PresignedFileRepPayload';
+import IFileRepository from '../../Infrastructure/Repositories/IFileRepository';
+import PresignedFileRepPayload from 'File/Domain/Payloads/PresignedFileRepPayload';
 import { ICriteria, IPaginator } from '@digichanges/shared-experience';
-import ListObjectsPayload from 'File/InterfaceAdapters/Payloads/ListObjectsPayload';
-import FileBase64RepPayload from '../../InterfaceAdapters/Payloads/FileBase64RepPayload';
-import FileMultipartRepPayload from '../../InterfaceAdapters/Payloads/FileMultipartRepPayload';
-import FileRepPayload from '../../InterfaceAdapters/Payloads/FileRepPayload';
-import CreateBucketPayload from '../../InterfaceAdapters/Payloads/CreateBucketPayload';
+import ListObjectsPayload from 'File/Domain/Payloads/ListObjectsPayload';
+import FileBase64RepPayload from '../Payloads/FileBase64RepPayload';
+import FileMultipartRepPayload from '../Payloads/FileMultipartRepPayload';
+import FileRepPayload from '../Payloads/FileRepPayload';
+import CreateBucketPayload from '../Payloads/CreateBucketPayload';
 import IdPayload from '../../../Shared/InterfaceAdapters/IdPayload';
-import FileDTO from '../../InterfaceAdapters/Payloads/FileDTO';
-import IFileDTO from '../../InterfaceAdapters/Payloads/IFileDTO';
+import FileDTO from '../Payloads/FileDTO';
+import IFileDTO from '../Payloads/IFileDTO';
 import { validate } from 'uuid';
 
 class FileService
@@ -83,13 +83,13 @@ class FileService
 
     async createBucket(payload: CreateBucketPayload): Promise<void>
     {
-        const name = payload.getBucketName();
+        const name = payload.getName();
         const bucketNamePrivate = `${name}.private`;
         const bucketNamePublic = `${name}.public`;
 
         const region = payload.getRegion();
-        const bucketPrivatePolicy = payload.getBucketPrivatePolicy();
-        const bucketPublicPolicy = payload.getBucketPublicPolicy();
+        const bucketPrivatePolicy = payload.getPrivateBucketPolicy();
+        const bucketPublicPolicy = payload.getPublicBucketPolicy();
 
         await this.fileSystem.createBucket(bucketNamePrivate, region);
         await this.fileSystem.setBucketPolicy(bucketPrivatePolicy, bucketNamePrivate);

src/File/Domain/UseCases/CreateBucketUseCase.ts

@@ -1,4 +1,4 @@
-import CreateBucketPayload from '../../InterfaceAdapters/Payloads/CreateBucketPayload';
+import CreateBucketPayload from '../Payloads/CreateBucketPayload';
 import FileService from '../Services/FileService';
 
 class CreateBucketUseCase

src/File/Domain/UseCases/DownloadUseCase.ts

@@ -1,4 +1,4 @@
-import IFileDTO from '../../InterfaceAdapters/Payloads/IFileDTO';
+import IFileDTO from '../Payloads/IFileDTO';
 import IdPayload from '../../../Shared/InterfaceAdapters/IdPayload';
 import FileService from '../Services/FileService';
 

src/File/Domain/UseCases/GetFileMetadataUseCase.ts

@@ -1,5 +1,5 @@
 import IdPayload from '../../../Shared/InterfaceAdapters/IdPayload';
-import IFileDomain from '../../InterfaceAdapters/IFileDomain';
+import IFileDomain from '../Entities/IFileDomain';
 import FileService from '../Services/FileService';
 
 class GetFileMetadataUserCase

src/File/Domain/UseCases/GetPresignedGetObjectUseCase.ts

@@ -1,4 +1,4 @@
-import PresignedFileRepPayload from '../../InterfaceAdapters/Payloads/PresignedFileRepPayload';
+import PresignedFileRepPayload from '../Payloads/PresignedFileRepPayload';
 import FileService from '../Services/FileService';
 
 class GetPresignedGetObjectUseCase

src/File/Domain/UseCases/ListObjectsUseCase.ts

@@ -1,4 +1,4 @@
-import ListObjectsPayload from '../../InterfaceAdapters/Payloads/ListObjectsPayload';
+import ListObjectsPayload from '../Payloads/ListObjectsPayload';
 import FileService from '../Services/FileService';
 
 class ListObjectsUseCase

src/File/Domain/UseCases/RemoveFileUseCase.ts

@@ -1,4 +1,4 @@
-import IFileDomain from '../../InterfaceAdapters/IFileDomain';
+import IFileDomain from '../Entities/IFileDomain';
 import IdPayload from '../../../Shared/InterfaceAdapters/IdPayload';
 import FileService from '../Services/FileService';
 

src/File/Domain/UseCases/UpdateFileBase64UseCase.ts

@@ -1,5 +1,5 @@
-import FileUpdateBase64Payload from '../../InterfaceAdapters/Payloads/FileUpdateBase64Payload';
-import IFileDomain from '../../InterfaceAdapters/IFileDomain';
+import FileUpdateBase64Payload from '../Payloads/FileUpdateBase64Payload';
+import IFileDomain from '../Entities/IFileDomain';
 import FileService from '../Services/FileService';
 
 class UpdateFileBase64UseCase

src/File/Domain/UseCases/UpdateFileMultipartUseCase.ts

@@ -1,5 +1,5 @@
-import FileUpdateMultipartPayload from '../../InterfaceAdapters/Payloads/FileUpdateMultipartPayload';
-import IFileDomain from '../../InterfaceAdapters/IFileDomain';
+import FileUpdateMultipartPayload from '../Payloads/FileUpdateMultipartPayload';
+import IFileDomain from '../Entities/IFileDomain';
 import FileService from '../Services/FileService';
 
 class UpdateFileMultipartUseCase

src/File/Domain/UseCases/UploadBase64UseCase.ts

@@ -1,5 +1,5 @@
-import FileBase64RepPayload from '../../InterfaceAdapters/Payloads/FileBase64RepPayload';
-import IFileDomain from '../../InterfaceAdapters/IFileDomain';
+import FileBase64RepPayload from '../Payloads/FileBase64RepPayload';
+import IFileDomain from '../Entities/IFileDomain';
 import File from '../Entities/File';
 import FileService from '../Services/FileService';
 
@@ -10,7 +10,7 @@ class UploadBase64UseCase
     async handle(payload: FileBase64RepPayload): Promise<any>
     {
         const build = {
-            isOriginalName: payload.getIsOriginalName(),
+            hasOriginalName: payload.getIsOriginalName(),
             originalName: payload.getOriginalName()
         };
 

src/File/Domain/UseCases/UploadMultipartUseCase.ts

@@ -1,5 +1,5 @@
-import FileMultipartRepPayload from '../../InterfaceAdapters/Payloads/FileMultipartRepPayload';
-import IFileDomain from '../../InterfaceAdapters/IFileDomain';
+import FileMultipartRepPayload from '../Payloads/FileMultipartRepPayload';
+import IFileDomain from '../Entities/IFileDomain';
 import File from '../Entities/File';
 import FileService from '../Services/FileService';
 
@@ -10,7 +10,7 @@ class UploadMultipartUseCase
     async handle(payload: FileMultipartRepPayload): Promise<any>
     {
         const build = {
-            isOriginalName: payload.getIsOriginalName(),
+            hasOriginalName: payload.getIsOriginalName(),
             originalName: payload.getOriginalName()
         };
 

src/File/Infrastructure/Repositories/FileMikroSqlRepository.ts

@@ -1,12 +1,12 @@
-import IFileRepository from '../../InterfaceAdapters/IFileRepository';
+import IFileRepository from './IFileRepository';
 import { injectable } from 'inversify';
 import { ICriteria, IPaginator } from '@digichanges/shared-experience';
 
 import Paginator from '../../../App/Presentation/Shared/MikroPaginator';
 import FileFilter from '../../Presentation/Criterias/FileFilter';
 import FileSchema from '../Schemas/FileMikroORM';
 import File from '../../Domain/Entities/File';
-import IFileDomain from '../../InterfaceAdapters/IFileDomain';
+import IFileDomain from '../../Domain/Entities/IFileDomain';
 
 import BaseMikroSqlRepository from '../../../App/Infrastructure/Repositories/BaseMikroSqlRepository';
 

src/File/Infrastructure/Repositories/FileMongoRepository.ts

@@ -2,12 +2,12 @@ import { Query } from 'mongoose';
 import { injectable } from 'inversify';
 import { ICriteria, IPaginator } from '@digichanges/shared-experience';
 
-import IFileRepository from '../../InterfaceAdapters/IFileRepository';
+import IFileRepository from './IFileRepository';
 
 import FileFilter from '../../Presentation/Criterias/FileFilter';
 import MongoPaginator from '../../../App/Presentation/Shared/MongoPaginator';
-import IFile from '../../InterfaceAdapters/IFileDocument';
-import IFileDomain from '../../InterfaceAdapters/IFileDomain';
+import IFile from '../Schemas/IFileDocument';
+import IFileDomain from '../../Domain/Entities/IFileDomain';
 
 import BaseMongoRepository from '../../../App/Infrastructure/Repositories/BaseMongoRepository';
 import File from '../../Domain/Entities/File';

src/File/Infrastructure/Repositories/FileSqlRepository.ts

@@ -1,12 +1,12 @@
-import IFileRepository from '../../InterfaceAdapters/IFileRepository';
+import IFileRepository from './IFileRepository';
 import { injectable } from 'inversify';
 import { ICriteria, IPaginator } from '@digichanges/shared-experience';
 
 import Paginator from '../../../App/Presentation/Shared/Paginator';
 import FileFilter from '../../Presentation/Criterias/FileFilter';
 import FileSchema from '../Schemas/FileTypeORM';
 import File from '../../Domain/Entities/File';
-import IFileDomain from '../../InterfaceAdapters/IFileDomain';
+import IFileDomain from '../../Domain/Entities/IFileDomain';
 
 import BaseSqlRepository from '../../../App/Infrastructure/Repositories/BaseSqlRepository';
 

src/File/InterfaceAdapters/IFileRepository.ts → src/File/Infrastructure/Repositories/IFileRepository.ts

@@ -1,6 +1,6 @@
 import { ICriteria, IPaginator } from '@digichanges/shared-experience';
-import IBaseRepository from '../../App/InterfaceAdapters/IBaseRepository';
-import IFileDomain from './IFileDomain';
+import IBaseRepository from '../../../App/InterfaceAdapters/IBaseRepository';
+import IFileDomain from '../../Domain/Entities/IFileDomain';
 
 interface IFileRepository extends IBaseRepository<IFileDomain>
 {