Skip to content

Commit

Permalink
Merge pull request #94 from DigiChanges/fix/LC/init-command
Browse files Browse the repository at this point in the history
fix: init-command, roleCommandRequest created, change bash to sh to r…
  • Loading branch information
Murzbul authored Mar 21, 2022
2 parents 46146ae + 9466fd4 commit cad7e9d
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 9 deletions.
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ exec:
@echo '************ ************'
docker-compose exec node bash

sh:
@echo '************ ************'
@echo '************ Exec NODE ************'
@echo '************ ************'
docker-compose exec node sh

test:
@echo '************ ************'
@echo '************ Exec NODE TEST ************'
Expand All @@ -62,7 +68,7 @@ init:
@echo '************ ************'
@echo '************ Init NODE ************'
@echo '************ ************'
docker-compose exec node bash dev.init.sh
docker-compose exec node sh dev.init.sh

clean:
docker-compose down -v --remove-orphans
Expand Down
51 changes: 51 additions & 0 deletions src/Role/Presentation/Requests/RoleCommandSaveRequest.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { IsArray, IsBoolean, IsOptional, IsString, Length } from 'class-validator';
import { decorate } from 'ts-mixer';
import RoleRepPayload from '../../Domain/Payloads/RoleRepPayload';

class RoleCommandSaveRequest implements RoleRepPayload
{
private readonly _name: string;
private readonly _slug: string;
private readonly _enable: boolean;
private readonly _permissions: string[];

constructor(env: any, role: any = null)
{
this._name = env.role;
this._slug = env.slug?.toLowerCase() ?? env.role?.toLowerCase();
this._enable = env.enable ?? true;
this._permissions = [];
}

@decorate(Length(3, 30))
@decorate(IsString())
get name(): string
{
return this._name;
}

@decorate(Length(3, 30))
@decorate(IsString())
get slug(): string
{
return this._slug;
}

@decorate(IsOptional())
@decorate(IsBoolean())
get enable(): boolean
{
return this._enable;
}

@decorate(IsArray())
@decorate(IsString({
each: true
}))
get permissions(): string[]
{
return this._permissions;
}
}

export default RoleCommandSaveRequest;
2 changes: 1 addition & 1 deletion src/Role/Presentation/Requests/RoleRepRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class RoleRepRequest implements RoleRepPayload
constructor(data: Record<string, any>)
{
this._name = data.name;
this._slug = data?.slug?.toLowerCase() ?? data?.name?.toLowerCase();
this._slug = data.slug?.toLowerCase() ?? data.name?.toLowerCase();
this._permissions = data.permissions ?? [];
this._enable = data.enable ?? true;
}
Expand Down
14 changes: 7 additions & 7 deletions src/User/Presentation/Commands/AddUserRoleCommand.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import UserCommandSaveRequest from '../Requests/UserCommandSaveRequest';
import commander from 'commander';
import SaveUserUseCase from '../../Domain/UseCases/SaveUserUseCase';
import RoleRepPayload from '../../../Role/Domain/Payloads/RoleRepPayload';
import SaveRoleUseCase from '../../../Role/Domain/UseCases/SaveRoleUseCase';
import UserSavePayload from '../../Domain/Payloads/UserSavePayload';
import RoleCommandSaveRequest from '../../../Role/Presentation/Requests/RoleCommandSaveRequest';
import Logger from '../../../Shared/Logger/Logger';
import RoleRepRequest from '../../../Role/Presentation/Requests/RoleRepRequest';
import RoleRepPayload from '../../../Role/Domain/Payloads/RoleRepPayload';
import UserSavePayload from '../../Domain/Payloads/UserSavePayload';
import SaveUserUseCase from '../../Domain/UseCases/SaveUserUseCase';
import UserCommandSaveRequest from '../Requests/UserCommandSaveRequest';

const AddUserRoleCommand = new commander.Command('addUserRole');

Expand All @@ -18,7 +18,7 @@ AddUserRoleCommand
.option('-ln, --lastName <lastName>', 'Last Name of the user')
.option('-p, --password <password>', 'Password of the user')
.option('-dt, --documentType <documentType>', 'Document Type of the user')
.option('-dn, --documentNumber <documentNumer>', 'Document Number of the user')
.option('-dn, --documentNumber <documentNumber>', 'Document Number of the user')
.option('-g, --gender <gender>', 'Gender of the user')
.option('-ph, --phone <phone>', 'Phone of the user')
.option('-c, --country <country>', 'Country of the user')
Expand All @@ -30,7 +30,7 @@ AddUserRoleCommand
const saveUserUseCase = new SaveUserUseCase();
const saveRoleUseCase = new SaveRoleUseCase();

const roleCommandRepRequest: RoleRepPayload = new RoleRepRequest(env);
const roleCommandRepRequest: RoleRepPayload = new RoleCommandSaveRequest(env);
const role = await saveRoleUseCase.handle(roleCommandRepRequest);

const userCommandRepRequest: UserSavePayload = new UserCommandSaveRequest(env, role);
Expand Down

0 comments on commit cad7e9d

Please sign in to comment.