Skip to content

fix(json-api-nestjs): fix check if field exist and camelcase transform #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 13, 2022
Merged

fix(json-api-nestjs): fix check if field exist and camelcase transform #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb0af92
fix(json-api-nestjs): fix check if field exist and camelcase transform
Dec 13, 2022
4282f9d
fix(json-api-nestjs): skip relation with id null
Dec 13, 2022
7606844
fix(json-api-nestjs): revert test
Dec 13, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libs/json-api-nestjs/src/lib/helper/utils/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ describe('Test utils', () => {
const result = snakeToCamel('test_test');
const result1 = snakeToCamel('test-test');
const result2 = snakeToCamel('testTest');
const result3 = snakeToCamel('event_incident_typeFK');
expect(result).toBe('testTest');
expect(result1).toBe('testTest');
expect(result2).toBe('testTest');
expect(result3).toBe('eventIncidentTypeFK');
});

it('isString', () => {
Expand Down
8 changes: 3 additions & 5 deletions libs/json-api-nestjs/src/lib/helper/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,9 @@ export function snakeToCamel(str: string): string {
if (!str.match(/[\s_-]/g)) {
return str;
}
return str
.toLowerCase()
.replace(/([-_][a-z])/g, (group) =>
group.toUpperCase().replace('-', '').replace('_', '')
);
return str.replace(/([-_][a-z])/g, (group) =>
group.toUpperCase().replace('-', '').replace('_', '')
);
}

export function camelToKebab(str: string): string {
Expand Down
6 changes: 4 additions & 2 deletions libs/json-api-nestjs/src/lib/mixin/service/transform/transform.mixin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export class TransformMixinService<T> {
this.commonColumnsForRelation.has(tableName) &&
this.commonColumnsForRelation.get(tableName).has(fieldName)
) {
if (!currentItem[field]) {
if (!(field in currentItem)) {
continue;
}
relationObject[tableName] = relationObject[tableName] || {};
Expand All @@ -141,7 +141,9 @@ export class TransformMixinService<T> {
val
);
if (Array.isArray(acum[key])) {
acum[key].push(plainObject);
if (plainObject[this.relationPrimaryField.get(key)] !== null) {
acum[key].push(plainObject);
}
} else {
acum[key] = plainObject;
}
Expand Down