Skip to content

Commit ff904cf

Browse files
Merge pull request #10 from hallisonbrancalhao/feature/transactions
refactor: changes `institutional` deps and users query
2 parents 5b306a9 + 99dc051 commit ff904cf

40 files changed

+57
-92
lines changed

Diff for: libs/institutional/data-access/README.md

-3
This file was deleted.

Diff for: libs/institutional/data-access/project.json

-9
This file was deleted.

Diff for: libs/institutional/data-access/src/lib/dtos/auth-user.ts

-1
This file was deleted.

Diff for: libs/institutional/data-access/src/lib/dtos/index.ts

-2
This file was deleted.

Diff for: libs/institutional/data-access/src/lib/dtos/registration-user.ts

-1
This file was deleted.

Diff for: libs/institutional/data-access/src/lib/infrastructure/create-user.mutate.ts

-11
This file was deleted.

Diff for: libs/institutional/data-access/src/public-api.ts

-3
This file was deleted.

Diff for: libs/institutional/domain/eslint.config.mjs

-3
This file was deleted.

Diff for: libs/institutional/domain/project.json

-9
This file was deleted.

Diff for: libs/institutional/domain/src/index.ts

-1
This file was deleted.

Diff for: libs/institutional/domain/tsconfig.json

-20
This file was deleted.

Diff for: libs/institutional/domain/tsconfig.lib.json

-9
This file was deleted.

Diff for: libs/institutional/feature-auth/src/lib/dialogs/login/auth-login.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { DialogRef } from '@angular/cdk/dialog';
33
import { AuthenticationForm } from '../../forms';
44
import { ReactiveFormsModule } from '@angular/forms';
55
import { NgIf } from '@angular/common';
6-
import { AuthFacade } from '@fiap-tech-challenge/institutional-data-access';
6+
import { AuthFacade } from '@fiap-tech-challenge/shared-data-access';
77

88

99
@Component({

Diff for: libs/institutional/feature-auth/src/lib/dialogs/register/register.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component, inject } from '@angular/core';
22
import { DialogRef } from '@angular/cdk/dialog';
3-
import { AuthFacade } from '@fiap-tech-challenge/institutional-data-access';
3+
import { AuthFacade } from '@fiap-tech-challenge/shared-data-access';
44
import { RegistrationForm } from '../../forms';
55
import { ReactiveFormsModule } from '@angular/forms';
66
import { NgIf } from '@angular/common';

Diff for: libs/institutional/feature-auth/src/lib/forms/authentication.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { FormControl, FormGroup, Validators } from '@angular/forms';
22
import { TypedForm } from '@fiap-tech-challenge/ui-global';
3-
import { AuthUser } from '@fiap-tech-challenge/domain';
3+
import { AuthUser } from '@fiap-tech-challenge/shared-data-access';
44

55
export class AuthenticationForm extends FormGroup<TypedForm<AuthUser>> {
66
constructor() {

Diff for: libs/institutional/feature-auth/src/lib/forms/registration.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { FormControl, FormGroup, Validators } from '@angular/forms';
22
import { TypedForm } from '@fiap-tech-challenge/ui-global';
3-
import { RegisterUser } from '@fiap-tech-challenge/domain';
3+
import { RegisterUser } from '@fiap-tech-challenge/shared-data-access';
44

55

66
export class RegistrationForm extends FormGroup<TypedForm<RegisterUser>> {

Diff for: libs/institutional/data-access/src/lib/application/auth.facade.ts renamed to libs/shared/data-access/src/lib/application/auth.facade.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { DestroyRef, inject, Injectable, signal } from '@angular/core';
22
import { AuthRepository } from '../infrastructure';
33
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
4-
import { AuthUser, RegisterUser } from '@fiap-tech-challenge/domain';
4+
import { AuthUser, RegisterUser } from '@fiap-tech-challenge/shared-domain';
55

66
@Injectable({ providedIn: 'root' })
77
export class AuthFacade {

Diff for: libs/shared/data-access/src/lib/core/guards/auth.guard.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { CanActivateFn, Router } from '@angular/router';
22
import { inject } from '@angular/core';
3-
import { AuthFacade } from '@fiap-tech-challenge/institutional-data-access';
3+
import { AuthFacade } from '../../application';
4+
45

56
export const authGuard: CanActivateFn = () => {
67
const router = inject(Router);

Diff for: libs/shared/data-access/src/lib/dtos/auth-user.ts

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { AuthUser } from '@fiap-tech-challenge/shared-domain';

Diff for: libs/shared/data-access/src/lib/dtos/index.ts

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export * from './auth-user';
2+
export * from './register-user';
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { RegisterUser } from '@fiap-tech-challenge/shared-domain';

Diff for: libs/shared/data-access/src/lib/index.ts

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
export * from './core/guards'
2+
export * from './infrastructure'
3+
export * from './application'
4+
export * from './dtos'

Diff for: libs/institutional/data-access/src/lib/infrastructure/auth.repository.ts renamed to libs/shared/data-access/src/lib/infrastructure/auth.repository.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { inject, Injectable } from '@angular/core';
22
import { GET_TOKEN_QUERY } from './get-token.query';
33
import { Apollo } from 'apollo-angular';
4-
import { AuthUser, RegisterUser } from '@fiap-tech-challenge/domain';
4+
import { AuthUser, RegisterUser } from '@fiap-tech-challenge/shared-domain';
55
import { CREATE_USER } from './create-user.mutate';
66

77
@Injectable({ providedIn: 'root' })
@@ -17,11 +17,11 @@ export class AuthRepository {
1717
});
1818
}
1919

20-
register(credentials: RegisterUser) {
20+
register(user: RegisterUser) {
2121
return this.#apollo.mutate({
2222
mutation: CREATE_USER,
2323
variables: {
24-
credentials,
24+
user
2525
},
2626
});
2727
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { gql } from 'apollo-angular';
2+
import { TypedDocumentNode } from '@apollo/client';
3+
import { RegisterUser } from '@fiap-tech-challenge/shared-domain';
4+
5+
export interface CreateUserResult {
6+
"data": {
7+
"register": {
8+
"email": string,
9+
"name": string,
10+
}
11+
}
12+
}
13+
14+
export interface CreateUserDto {
15+
user: RegisterUser
16+
}
17+
18+
export const CREATE_USER: TypedDocumentNode<CreateUserResult, CreateUserDto> = gql`
19+
mutation AddUser($user: CreateUserDto!) {
20+
register(input: $user) {
21+
email
22+
name
23+
}
24+
}
25+
`

Diff for: libs/institutional/data-access/src/lib/infrastructure/get-token.query.ts renamed to libs/shared/data-access/src/lib/infrastructure/get-token.query.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import { gql } from 'apollo-angular';
22
import { TypedDocumentNode } from '@apollo/client';
3+
import { AuthUser } from '@fiap-tech-challenge/shared-domain';
34

45
export interface LoginUserDto {
5-
credentials: {
6-
email: string,
7-
password: string,
8-
},
6+
credentials: AuthUser
97
}
108

119
export interface GetTokenResult {
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# domain
1+
# shared-domain
22

33
This library was generated with [Nx](https://nx.dev).

Diff for: libs/shared/domain/project.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"name": "shared-domain",
3+
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
4+
"sourceRoot": "libs/shared/domain/src",
5+
"projectType": "library",
6+
"tags": [],
7+
"// targets": "to see all targets run: nx show project shared-domain --web",
8+
"targets": {}
9+
}
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: projects/dashboard/src/app/app.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ApplicationConfig, provideZoneChangeDetection } from '@angular/core';
22
import { provideRouter } from '@angular/router';
33
import { appRoutes } from './app.routes';
4-
import { AuthFacade, AuthRepository } from '@fiap-tech-challenge/institutional-data-access';
4+
import { AuthFacade, AuthRepository } from '@fiap-tech-challenge/shared-data-access';
55

66

77
const FACADES = [ AuthFacade ];

Diff for: projects/institutional/src/app/app.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
withEventReplay,
77
} from '@angular/platform-browser';
88
import { provideHttpClient } from '@angular/common/http';
9-
import { AuthFacade, AuthRepository } from '@fiap-tech-challenge/institutional-data-access';
9+
import { AuthFacade, AuthRepository } from '@fiap-tech-challenge/shared-data-access';
1010

1111
const FACADES = [ AuthFacade ];
1212
const REPOSITORIES = [ AuthRepository ];

Diff for: tsconfig.base.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,16 @@
2424
"@fiap-tech-challenge/dashboard-domain": [
2525
"libs/dashboard/domain/src/index.ts"
2626
],
27-
"@fiap-tech-challenge/domain": ["libs/institutional/domain/src/index.ts"],
2827
"@fiap-tech-challenge/feature-auth": [
2928
"libs/institutional/feature-auth/src/index.ts"
3029
],
3130
"@fiap-tech-challenge/feature-home": [
3231
"libs/institutional/feature-home/src/index.ts"
3332
],
34-
"@fiap-tech-challenge/institutional-data-access": [
35-
"libs/institutional/data-access/src/index.ts"
36-
],
3733
"@fiap-tech-challenge/shared-data-access": [
3834
"libs/shared/data-access/src/index.ts"
3935
],
36+
"@fiap-tech-challenge/shared-domain": ["libs/shared/domain/src/index.ts"],
4037
"@fiap-tech-challenge/ui-components": [
4138
"libs/shared/ui-components/src/index.ts"
4239
],

0 commit comments

Comments
 (0)