Merge pull request #24 from klerick/fix-again

Fix again

Author: klerick

libs/json-api-nestjs-sdk/src/lib/service/json-api-utils/json-api-utils.service.ts

@@ -26,14 +26,6 @@ import { ObjectLiteral } from 'typeorm';
 export class JsonApiUtilsService {
   protected jsonApiSdkConfig = inject<JsonApiSdkConfig>(JSON_API_SDK_CONFIG);
   protected listEntities = inject<ListEntities>(ALL_ENTITIES);
-  // protected patchEntities = inject<ListEntities>(PATCH_ENTITIES, {
-  //   optional: true,
-  // });
-
-  constructor() {
-    console.log(this.listEntities);
-  }
-
   public getUrlForResource(resource: string): string {
     const url: string[] = [camelToKebab(resource).toLocaleLowerCase()];
     if (this.jsonApiSdkConfig.apiPrefix) {

libs/json-api-nestjs-sdk/src/lib/token/json-api-sdk.ts

@@ -11,13 +11,6 @@ export interface ListEntities {
 
 export const JSON_API_SDK_CONFIG = new InjectionToken<JsonApiSdkConfig>(
   'Main config object for sdk'
-  // {
-  //   // providedIn: JsonApiNestjsSdkModule,
-  //   factory: () => {
-  //     console.log(inject(API_SDK_CONFIG, { optional: true }));
-  //     return inject(API_SDK_CONFIG, { optional: true }) as any;
-  //   },
-  // }
 );
 
 export const API_SDK_CONFIG = new InjectionToken<JsonApiSdkConfig>(

libs/json-api-nestjs/src/lib/factory/ajv/utils/input-body-post-schema.ts

@@ -77,6 +77,11 @@ export function inputBodyPostSchema(
             type: 'boolean',
           };
           break;
+        case Object:
+          dataType = {
+            type: 'object',
+          };
+          break;
         default:
           dataType = {
             type: 'string',

libs/json-api-nestjs/src/lib/mixin/service/typeorm/methods/delete-one/delete-one.ts

@@ -10,9 +10,9 @@ export async function deleteOne<T>(
 ): Promise<void> {
   const preparedResourceName = snakeToCamel(this.repository.metadata.name);
   const { id } = options.route;
-
+  const primaryID = this.repository.metadata.primaryColumns[0].propertyName;
   const builder = this.repository.createQueryBuilder(preparedResourceName);
-  builder.where({ id });
+  builder.where({ [primaryID]: id });
 
   const result = await builder.getOne();
   if (!result) {

libs/json-api-nestjs/src/lib/mixin/service/typeorm/methods/get-one/get-one.ts

@@ -55,10 +55,11 @@ export async function getOne<T>(
       });
     });
   }
+  const primaryID = this.repository.metadata.primaryColumns[0].propertyName;
   const prepareParams = Date.now() - startTime;
   const result = await builder
     .select([...fieldsSelect])
-    .where({ id })
+    .where({ [primaryID]: id })
     .getRawMany();
 
   if (result.length === 0) {

libs/json-api-nestjs/src/lib/mixin/service/typeorm/methods/patch-one/patch-one.ts

@@ -29,9 +29,9 @@ export async function patchOne<T>(
       detail: "Data 'id' must be equal to url param",
     });
   }
-
+  const primaryID = this.repository.metadata.primaryColumns[0].propertyName;
   const whereCondition = {
-    id: Equal(id),
+    [primaryID]: Equal(id),
   } as unknown as FindOptionsWhere<T>;
 
   const target = await this.repository.findOne({