Skip to content

Commit 81fd183

Browse files
committed
chore: Some changes for developing
1 parent a8c6f83 commit 81fd183

File tree

12 files changed

+98
-78
lines changed

12 files changed

+98
-78
lines changed

apps/json-api-front/src/app/app.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Component, inject, OnInit } from '@angular/core';
22
import { NxWelcomeComponent } from './nx-welcome.component';
33
import { JsonApiSdkService } from 'json-api-nestjs-sdk';
4-
import { AtomicFactory } from 'json-api-nestjs-sdk/json-api-nestjs-sdk.module';
4+
import { AtomicFactory } from 'json-api-nestjs-sdk/ngModule';
55
import {
66
JSON_RPC,
77
RPC_BATCH,
88
Rpc,
9-
} from '@klerick/nestjs-json-rpc-sdk/json-rpc-sdk.module';
9+
} from '@klerick/nestjs-json-rpc-sdk/ngModule';
1010

1111
import { RpcService as IRpcService } from '@nestjs-json-api/type-for-rpc';
1212
import { switchMap } from 'rxjs';

apps/json-api-front/src/app/app.config.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ import {
33
importProvidersFrom,
44
InjectionToken,
55
} from '@angular/core';
6-
import { JsonApiAngular } from 'json-api-nestjs-sdk/json-api-nestjs-sdk.module';
6+
import { JsonApiAngular, provideJsonApi } from 'json-api-nestjs-sdk/ngModule';
77
import {
88
JsonRpcAngular,
99
JsonRpcAngularConfig,
1010
TransportType,
11-
} from '@klerick/nestjs-json-rpc-sdk/json-rpc-sdk.module';
11+
provideJsonRpc,
12+
} from '@klerick/nestjs-json-rpc-sdk/ngModule';
1213
import { Subject } from 'rxjs';
1314
import { webSocket } from 'rxjs/webSocket';
1415
import { io } from 'socket.io-client';
16+
import { provideHttpClient, withInterceptors } from '@angular/common/http';
1517

1618
const destroySubject = new Subject<boolean>();
1719
setTimeout(() => {

apps/json-api-server/src/app/resources/controllers/extend-user/extend-user.controller.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import {
2929
HttpExceptionMethodFilter,
3030
} from '../../service/http-exception.filter';
3131
import { GuardService, EntityName } from '../../service/guard.service';
32+
import { AtomicInterceptor } from '../../service/atomic.interceptor';
3233

3334
@UseGuards(GuardService)
3435
@UseFilters(new HttpExceptionFilter())
@@ -52,6 +53,7 @@ export class ExtendUserController extends JsonBaseController<Users> {
5253
return super.patchRelationship(id, relName, input);
5354
}
5455

56+
// @UseInterceptors(AtomicInterceptor)
5557
postOne(inputData: PostData<Users>): Promise<ResourceObject<Users>> {
5658
return super.postOne(inputData);
5759
}

apps/json-api-server/src/main.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ async function bootstrap() {
2525
SwaggerModule.setup(
2626
'swagger',
2727
app,
28-
() => SwaggerModule.createDocument(app, config),
28+
() => ({
29+
...SwaggerModule.createDocument(app, config),
30+
openapi: '3.1.0',
31+
}),
2932
{}
3033
);
3134
await app.init();

libs/database/src/lib/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { TypeOrmModuleOptions } from '@nestjs/typeorm';
22

33
import { config as ormConfig } from './config-cli';
4-
import { Roles, Comments, Users, Addresses, BookList } from './entities';
4+
import * as allEntities from './entities';
55

66
export const config: TypeOrmModuleOptions = {
77
...ormConfig,
88
...{
9-
entities: [Roles, Comments, Users, Addresses, BookList],
9+
entities: Object.values(allEntities) as any,
1010
},
1111
};

libs/json-api/json-api-nestjs/src/lib/mock-utils/db-for-test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,8 @@ CREATE TABLE public.users (
300300
first_name character varying,
301301
last_name character varying,
302302
is_active boolean DEFAULT false,
303+
test_real real[],
304+
test_array_null real[],
303305
manager_id integer,
304306
addresses_id integer,
305307
user_groups_id integer,

libs/json-api/json-api-nestjs/src/lib/mock-utils/entities/pods.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
CreateDateColumn,
44
Entity,
55
ManyToMany,
6-
PrimaryGeneratedColumn,
6+
PrimaryColumn,
77
UpdateDateColumn,
88
} from 'typeorm';
99

@@ -13,8 +13,8 @@ export type IPods = Pods;
1313

1414
@Entity('pods')
1515
export class Pods {
16-
@PrimaryGeneratedColumn()
17-
public id!: number;
16+
@PrimaryColumn()
17+
public id!: string;
1818

1919
@Column({
2020
type: 'varchar',

libs/json-api/json-api-nestjs/src/lib/mock-utils/entities/users.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,22 @@ export class Users {
3737
})
3838
public firstName!: string;
3939

40+
@Column({
41+
name: 'test_real',
42+
type: 'real',
43+
array: true,
44+
default: [],
45+
})
46+
public testReal!: number[];
47+
48+
@Column({
49+
name: 'test_array_null',
50+
type: 'real',
51+
array: true,
52+
nullable: true,
53+
})
54+
public testArrayNull!: number[] | null;
55+
4056
@Column({
4157
name: 'last_name',
4258
type: 'varchar',

libs/json-api/json-api-nestjs/src/lib/mock-utils/utils/provider-entities.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
Comments,
88
Entities,
99
Notes,
10+
Pods,
1011
Roles,
1112
UserGroups,
1213
} from '../entities';
@@ -52,12 +53,17 @@ export function getRepository(module: TestingModule) {
5253
getRepositoryToken(UserGroups, DEFAULT_CONNECTION_NAME)
5354
);
5455

56+
const podsRepository = module.get<Repository<Pods>>(
57+
getRepositoryToken(Pods, DEFAULT_CONNECTION_NAME)
58+
);
59+
5560
return {
5661
userRepository,
5762
addressesRepository,
5863
notesRepository,
5964
commentsRepository,
6065
rolesRepository,
6166
userGroupRepository,
67+
podsRepository,
6268
};
6369
}

libs/json-api/json-api-nestjs/src/lib/mock-utils/utils/pull-data.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ export async function pullUser(userPero: Repository<Users>) {
5151
lastName: user.lastName,
5252
firstName: user.firstName,
5353
});
54+
user.testReal = [faker.number.float({ fractionDigits: 4 })];
55+
user.testArrayNull = null;
56+
5457
user.testDate = faker.date.anytime();
5558

5659
return userPero.save(user);

0 commit comments

Comments
 (0)