Skip to content

Commit 174f1fe

Browse files
committed
fix(cat): Remove unnecessary code
1 parent de3597e commit 174f1fe

6 files changed

+82
-39
lines changed

src/cat/fixtures/infrastructure/mikroOrm/command/CatSetQueryMikroOrmFixtures.ts

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,29 @@
11
import { EntityData } from '@mikro-orm/core';
22

33
import { CatMikroOrm } from '../../../../infrastructure/mikroOrm/model/CatMikroOrm';
4+
import { CatFixtures } from '../../../domain/model/CatFixtures';
45

56
export class CatSetQueryMikroOrmFixtures {
6-
public static get any(): EntityData<CatMikroOrm> {
7-
const CatSetQueryMikroOrm: EntityData<CatMikroOrm> = {};
7+
public static get withBornDate(): EntityData<CatMikroOrm> {
8+
const CatSetQueryMikroOrm: EntityData<CatMikroOrm> = {
9+
bornDate: CatFixtures.any.bornDate,
10+
};
11+
12+
return CatSetQueryMikroOrm;
13+
}
14+
15+
public static get withColor(): EntityData<CatMikroOrm> {
16+
const CatSetQueryMikroOrm: EntityData<CatMikroOrm> = {
17+
color: CatFixtures.any.color,
18+
};
19+
20+
return CatSetQueryMikroOrm;
21+
}
22+
23+
public static get withName(): EntityData<CatMikroOrm> {
24+
const CatSetQueryMikroOrm: EntityData<CatMikroOrm> = {
25+
name: CatFixtures.any.name,
26+
};
827

928
return CatSetQueryMikroOrm;
1029
}

src/cat/infrastructure/mikroOrm/converter/CatFindQueryToCatFindQueryMikroOrmConverterAsync.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ export class CatFindQueryToCatFindQueryMikroOrmConverterAsync extends BaseEntity
1515
_input: CatFindQuery,
1616
baseEntityFindQueryMikroOrm: ObjectQuery<BaseEntityMikroOrm>,
1717
): Promise<ObjectQuery<CatMikroOrm>> {
18-
const CatFindQueryMikroOrm: ObjectQuery<CatMikroOrm> = {
18+
const catFindQueryMikroOrm: ObjectQuery<CatMikroOrm> = {
1919
...(baseEntityFindQueryMikroOrm as ObjectQuery<CatMikroOrm>),
2020
};
2121

22-
return CatFindQueryMikroOrm;
22+
return catFindQueryMikroOrm;
2323
}
2424
}

src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.spec.ts

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,60 @@ describe(CatSetCommandToCatSetQueryMikroOrmConverterAsync.name, () => {
1414
});
1515

1616
describe('.convert()', () => {
17-
describe('when called', () => {
18-
let catSetCommandFixture: CatSetCommand;
19-
let catSetQueryMikroOrmFixture: EntityData<CatMikroOrm>;
20-
let result: unknown;
17+
describe('having a CatSetCommand with bornDate', () => {
18+
describe('when called', () => {
19+
let catSetCommandFixture: CatSetCommand;
20+
let catSetQueryMikroOrmFixture: EntityData<CatMikroOrm>;
21+
let result: unknown;
2122

22-
beforeAll(async () => {
23-
catSetCommandFixture = CatSetCommandFixtures.any;
24-
catSetQueryMikroOrmFixture = CatSetQueryMikroOrmFixtures.any;
23+
beforeAll(async () => {
24+
catSetCommandFixture = CatSetCommandFixtures.withBornDate;
25+
catSetQueryMikroOrmFixture = CatSetQueryMikroOrmFixtures.withBornDate;
2526

26-
result = await catSetCommandToCatSetQueryMikroOrmConverterAsync.convert(catSetCommandFixture);
27+
result = await catSetCommandToCatSetQueryMikroOrmConverterAsync.convert(catSetCommandFixture);
28+
});
29+
30+
it('should return a EntityData<CatMikroOrm>', () => {
31+
expect(result).toStrictEqual(catSetQueryMikroOrmFixture);
32+
});
2733
});
34+
});
35+
36+
describe('having a CatSetCommand with color', () => {
37+
describe('when called', () => {
38+
let catSetCommandFixture: CatSetCommand;
39+
let catSetQueryMikroOrmFixture: EntityData<CatMikroOrm>;
40+
let result: unknown;
41+
42+
beforeAll(async () => {
43+
catSetCommandFixture = CatSetCommandFixtures.withColor;
44+
catSetQueryMikroOrmFixture = CatSetQueryMikroOrmFixtures.withColor;
45+
46+
result = await catSetCommandToCatSetQueryMikroOrmConverterAsync.convert(catSetCommandFixture);
47+
});
48+
49+
it('should return a EntityData<CatMikroOrm>', () => {
50+
expect(result).toStrictEqual(catSetQueryMikroOrmFixture);
51+
});
52+
});
53+
});
54+
55+
describe('having a CatSetCommand with name', () => {
56+
describe('when called', () => {
57+
let catSetCommandFixture: CatSetCommand;
58+
let catSetQueryMikroOrmFixture: EntityData<CatMikroOrm>;
59+
let result: unknown;
60+
61+
beforeAll(async () => {
62+
catSetCommandFixture = CatSetCommandFixtures.withName;
63+
catSetQueryMikroOrmFixture = CatSetQueryMikroOrmFixtures.withName;
64+
65+
result = await catSetCommandToCatSetQueryMikroOrmConverterAsync.convert(catSetCommandFixture);
66+
});
2867

29-
it('should return a EntityData<CatMikroOrm>', () => {
30-
expect(result).toStrictEqual(catSetQueryMikroOrmFixture);
68+
it('should return a EntityData<CatMikroOrm>', () => {
69+
expect(result).toStrictEqual(catSetQueryMikroOrmFixture);
70+
});
3171
});
3272
});
3373
});

src/cat/infrastructure/mikroOrm/converter/CatSetCommandToCatSetQueryMikroOrmConverterAsync.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,17 @@ export class CatSetCommandToCatSetQueryMikroOrmConverterAsync extends BaseEntity
1919
...baseEntitySetQueryMikroOrm,
2020
};
2121

22-
this.setPropertyIfNotUndefined(input, catSetQueryMikroOrm, 'bornDate', 'bornDate');
22+
if (input.bornDate !== undefined) {
23+
catSetQueryMikroOrm.bornDate = input.bornDate;
24+
}
2325

24-
this.setPropertyIfNotUndefined(input, catSetQueryMikroOrm, 'color', 'color');
26+
if (input.color !== undefined) {
27+
catSetQueryMikroOrm.color = input.color;
28+
}
2529

26-
this.setPropertyIfNotUndefined(input, catSetQueryMikroOrm, 'name', 'name');
30+
if (input.name !== undefined) {
31+
catSetQueryMikroOrm.name = input.name;
32+
}
2733

2834
return catSetQueryMikroOrm;
2935
}

src/common/infrastructure/mikroOrm/converter/BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterAsync.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,6 @@ export abstract class BaseEntityFindQueryToBaseEntityFindQueryMikroOrmConverterA
3030
return baseEntityFindQueryMikroOrm;
3131
}
3232

33-
protected setPropertyIfNotUndefined(
34-
input: TInput,
35-
findQueryMikroOrm: TOutput,
36-
queryProperty: keyof TInput,
37-
entityProperty: keyof TOutput,
38-
): void {
39-
if (input[queryProperty] !== undefined) {
40-
findQueryMikroOrm[entityProperty] = input[queryProperty] as unknown as TOutput[keyof TOutput];
41-
}
42-
}
43-
4433
protected abstract convertToSpecificEntityFindQueryMikroOrm(
4534
input: TInput,
4635
baseEntityFindQueryMikroOrm: ObjectQuery<BaseEntityMikroOrm>,

src/common/infrastructure/mikroOrm/converter/BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterAsync.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,6 @@ export abstract class BaseEntitySetCommandToBaseEntitySetQueryMikroOrmConverterA
2626
return output;
2727
}
2828

29-
protected setPropertyIfNotUndefined(
30-
input: TInput,
31-
setQueryMikroOrm: TOutput,
32-
commandProperty: keyof TInput,
33-
entityProperty: keyof TOutput,
34-
): void {
35-
if (input[commandProperty] !== undefined) {
36-
setQueryMikroOrm[entityProperty] = input[commandProperty] as unknown as TOutput[keyof TOutput];
37-
}
38-
}
39-
4029
protected abstract convertToSpecificEntitySetQueryMikroOrm(
4130
input: TInput,
4231
baseEntitySetQueryMikroOrm: EntityData<BaseEntityMikroOrm>,

0 commit comments

Comments
 (0)