Skip to content

Commit 1ae2585

Browse files
committed
refactor(json-api-nestjs): add method for validate from microorm
1 parent 30b3988 commit 1ae2585

File tree

162 files changed

+3879
-956
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+3879
-956
lines changed

.env

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ DB_TYPE=postgres
1313
#DB_NAME="example_new"
1414
#DB_PORT=3306
1515
#DB_TYPE=mysql
16+
17+
18+
ORM_TYPE=microorm
19+
#ORM_TYPE=typeorm

apps/json-api-server-e2e/src/json-api/json-api-sdk/atomic-sdk.spec.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import { INestApplication } from '@nestjs/common';
22
import { FilterOperand, JsonSdkPromise } from '@klerick/json-api-nestjs-sdk';
3-
import { Addresses, CommentKind, Comments, Roles, Users } from 'database';
3+
import {
4+
Addresses,
5+
CommentKind,
6+
Comments,
7+
Roles,
8+
Users,
9+
} from '@nestjs-json-api/typeorm-database';
410
import { faker } from '@faker-js/faker';
511
import { getUser } from '../utils/data-utils';
612
import { run, creatSdk } from '../utils/run-application';

apps/json-api-server-e2e/src/json-api/json-api-sdk/check-common-decorator.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { INestApplication } from '@nestjs/common';
22
import { FilterOperand, JsonSdkPromise } from '@klerick/json-api-nestjs-sdk';
33
import { AxiosError } from 'axios';
4-
import { Users } from 'database';
4+
import { Users } from '@nestjs-json-api/typeorm-database';
55

66
import { run, creatSdk } from '../utils/run-application';
77

apps/json-api-server-e2e/src/json-api/json-api-sdk/check-othe-call.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { INestApplication } from '@nestjs/common';
22
import { FilterOperand, JsonSdkPromise } from '@klerick/json-api-nestjs-sdk';
3-
import { BookList, Users } from 'database';
3+
import { BookList, Users } from '@nestjs-json-api/typeorm-database';
44
import { AxiosError } from 'axios';
55
import { faker } from '@faker-js/faker';
66
import { lastValueFrom } from 'rxjs';

apps/json-api-server-e2e/src/json-api/json-api-sdk/get-method.spec.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
import { INestApplication } from '@nestjs/common';
2-
import { Addresses, CommentKind, Comments, Roles, Users } from 'database';
2+
import {
3+
Addresses,
4+
CommentKind,
5+
Comments,
6+
Roles,
7+
Users,
8+
} from '@nestjs-json-api/typeorm-database';
39
import { faker } from '@faker-js/faker';
410

511
import { FilterOperand, JsonSdkPromise } from '@klerick/json-api-nestjs-sdk';

apps/json-api-server-e2e/src/json-api/json-api-sdk/patch-methode.spec.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import { INestApplication } from '@nestjs/common';
2-
import { Addresses, CommentKind, Comments, Users } from 'database';
2+
import {
3+
Addresses,
4+
CommentKind,
5+
Comments,
6+
Users,
7+
} from '@nestjs-json-api/typeorm-database';
38
import { faker } from '@faker-js/faker';
49
import { JsonSdkPromise } from '@klerick/json-api-nestjs-sdk';
510

apps/json-api-server-e2e/src/json-api/json-api-sdk/post-method.spec.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
import { Addresses, BookList, CommentKind, Comments, Users } from 'database';
1+
import {
2+
Addresses,
3+
BookList,
4+
CommentKind,
5+
Comments,
6+
Users,
7+
} from '@nestjs-json-api/typeorm-database';
28
import { faker } from '@faker-js/faker';
39
import { JsonSdkPromise } from '@klerick/json-api-nestjs-sdk';
410

apps/json-api-server-e2e/src/json-api/utils/data-utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Users } from 'database';
1+
import { Users } from '@nestjs-json-api/typeorm-database';
22
import { faker } from '@faker-js/faker';
33

44
export const getUser = () => {

apps/json-api-server/src/app/app.module.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
import { Module } from '@nestjs/common';
22
import { LoggerModule } from 'nestjs-pino';
33

4-
import { DatabaseModule } from 'database';
4+
import { TypeOrmDatabaseModule } from '@nestjs-json-api/typeorm-database';
5+
import { MicroOrmDatabaseModule } from '@nestjs-json-api/microorm-database';
56
import { ResourcesModule } from './resources/resources.module';
67
import { RpcModule } from './rpc/rpc.module';
78
import * as process from 'process';
89

10+
const ormModule =
11+
process.env['ORM_TYPE'] === 'typeorm'
12+
? TypeOrmDatabaseModule
13+
: MicroOrmDatabaseModule;
14+
915
@Module({
1016
imports: [
11-
DatabaseModule,
17+
ormModule,
1218
ResourcesModule,
1319
RpcModule,
1420
LoggerModule.forRoot({
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { Users as tUsers } from '@nestjs-json-api/typeorm-database';
2+
import { Users as mkUsers } from '@nestjs-json-api/microorm-database';
3+
4+
import { BookList as tBookList } from '@nestjs-json-api/typeorm-database';
5+
import { BookList as mkBookList } from '@nestjs-json-api/microorm-database';
6+
7+
const Users = process.env['ORM_TYPE'] === 'typeorm' ? tUsers : mkUsers;
8+
const BookList = process.env['ORM_TYPE'] === 'typeorm' ? tBookList : tBookList;
9+
10+
export { Users, BookList };

0 commit comments

Comments
 (0)