Skip to content

Commit aa09d9c

Browse files
andrechristikanandrechristikan
committed
resolve conflict
2 parents ab67501 + 82160e7 commit aa09d9c

File tree

7 files changed

+53
-28
lines changed

7 files changed

+53
-28
lines changed

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ack-nestjs-boilerplate-kafka",
3-
"version": "3.3.1",
3+
"version": "3.3.2",
44
"description": "Ack NestJs Boilerplate Kafka",
55
"repository": {
66
"type": "git",
@@ -78,13 +78,13 @@
7878
"morgan": "^1.10.0",
7979
"nest-winston": "^1.8.0",
8080
"nestjs-command": "^3.1.3",
81-
"nestjs-i18n": "^10.2.5",
81+
"nestjs-i18n": "^10.2.6",
8282
"passport": "^0.6.0",
8383
"passport-headerapikey": "^1.2.2",
8484
"passport-jwt": "^4.0.1",
8585
"reflect-metadata": "^0.1.13",
8686
"response-time": "^2.3.2",
87-
"rimraf": "^3.0.2",
87+
"rimraf": "^4.0.4",
8888
"rotating-file-stream": "^3.0.4",
8989
"rxjs": "^7.8.0",
9090
"ua-parser-js": "^1.0.32",
@@ -123,9 +123,9 @@
123123
"eslint-plugin-import": "^2.27.4",
124124
"husky": "^8.0.3",
125125
"jest": "^29.3.1",
126-
"prettier": "^2.8.2",
126+
"prettier": "^2.8.3",
127127
"supertest": "^6.3.3",
128-
"ts-jest": "^29.0.4",
128+
"ts-jest": "^29.0.5",
129129
"ts-loader": "^9.4.2",
130130
"ts-node": "^10.9.1",
131131
"ts-prune": "^0.10.3",

‎src/common/api-key/services/api-key.service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,14 @@ export class ApiKeyService implements IApiKeyService {
223223
_id: string,
224224
options?: IDatabaseSoftDeleteOptions
225225
): Promise<ApiKeyEntity> {
226-
return this.apiKeyRepository.deleteOneById(_id, options);
226+
return this.apiKeyRepository.softDeleteOneById(_id, options);
227227
}
228228

229229
async deleteOne(
230230
find: Record<string, any>,
231231
options?: IDatabaseSoftDeleteOptions
232232
): Promise<ApiKeyEntity> {
233-
return this.apiKeyRepository.deleteOne(find, options);
233+
return this.apiKeyRepository.softDeleteOne(find, options);
234234
}
235235

236236
async validateHashApiKey(

‎src/common/setting/services/setting.service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@ export class SettingService implements ISettingService {
9595
_id: string,
9696
options?: IDatabaseSoftDeleteOptions
9797
): Promise<SettingEntity> {
98-
return this.settingRepository.deleteOneById(_id, options);
98+
return this.settingRepository.softDeleteOneById(_id, options);
9999
}
100100

101101
async deleteOne(
102102
find: Record<string, any>,
103103
options?: IDatabaseSoftDeleteOptions
104104
): Promise<SettingEntity> {
105-
return this.settingRepository.deleteOne(find, options);
105+
return this.settingRepository.softDeleteOne(find, options);
106106
}
107107

108108
async getValue<T>(setting: SettingEntity): Promise<T> {

‎test/unit/api-key/api-key.service.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ describe('ApiKeyService', () => {
6666
jest.clearAllMocks();
6767

6868
try {
69-
await apiKeyService.deleteOne({
69+
await apiKeyService.deleteMany({
7070
_id: apiKey._id,
7171
});
7272
await apiKeyService.deleteMany({
@@ -400,7 +400,7 @@ describe('ApiKeyService', () => {
400400
});
401401

402402
it('should be not found', async () => {
403-
await apiKeyService.deleteOneById(apiKey._id);
403+
await apiKeyService.deleteMany({ _id: apiKey._id });
404404
const result: ApiKeyEntity = await apiKeyService.deleteOneById(
405405
apiKey._id
406406
);
@@ -429,7 +429,7 @@ describe('ApiKeyService', () => {
429429
});
430430

431431
it('should be not found', async () => {
432-
await apiKeyService.deleteOne({
432+
await apiKeyService.deleteMany({
433433
_id: apiKey._id,
434434
});
435435
const result: ApiKeyEntity = await apiKeyService.deleteOne({

‎test/unit/logger/logger.service.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ describe('LoggerService', () => {
9797
jest.clearAllMocks();
9898

9999
try {
100-
await apiKeyService.deleteOneById(apiKey._id);
100+
await apiKeyService.deleteMany({ _id: apiKey._id });
101101
} catch (err: any) {
102102
console.error(err);
103103
}

‎test/unit/setting/setting.service.spec.ts‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ describe('SettingService', () => {
5757
jest.clearAllMocks();
5858

5959
try {
60-
await settingService.deleteOneById(setting._id);
61-
await settingService.deleteOne({
60+
await settingService.deleteMany({ _id: setting._id });
61+
await settingService.deleteMany({
6262
name: {
6363
$in: [
6464
settingName1,
@@ -322,6 +322,21 @@ describe('SettingService', () => {
322322
});
323323
});
324324

325+
describe('deleteOneById', () => {
326+
it('should be success', async () => {
327+
const result: SettingEntity = await settingService.deleteOneById(
328+
setting._id
329+
);
330+
331+
jest.spyOn(settingService, 'deleteOneById').mockReturnValueOnce(
332+
result as any
333+
);
334+
335+
expect(result).toBeTruthy();
336+
expect(result._id).toBe(setting._id);
337+
});
338+
});
339+
325340
describe('deleteOne', () => {
326341
it('should be success', async () => {
327342
const result: SettingEntity = await settingService.deleteOne({

‎yarn.lock‎

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6883,10 +6883,10 @@ nestjs-command@^3.1.3:
68836883
lodash.compact "^3.0.1"
68846884
lodash.flattendeep "^4.4.0"
68856885

6886-
nestjs-i18n@^10.2.5:
6887-
version "10.2.5"
6888-
resolved "https://registry.yarnpkg.com/nestjs-i18n/-/nestjs-i18n-10.2.5.tgz#65997a6c4bca6b50ae3412f0fe030d502a5883da"
6889-
integrity sha512-G/CjYmJZ5ei5erK2nsa+J+USHu3eg7sksuvfWaeaWQBKkrKMjPMO8bde2X46hvmlpCGN401IbMChhIWd2jR/pw==
6886+
nestjs-i18n@^10.2.6:
6887+
version "10.2.6"
6888+
resolved "https://registry.yarnpkg.com/nestjs-i18n/-/nestjs-i18n-10.2.6.tgz#ea15e863731036ddd5f4eb5068c56dab1355ebdc"
6889+
integrity sha512-vWjOXNz3ohJcKybtgdCWruNqreNOkVGfbTzGFxxdZ6Y9VfVJERT2+/30KAcBwJTpjuStoTVhMpILAKkXMk8KLQ==
68906890
dependencies:
68916891
accept-language-parser "^1.5.0"
68926892
chokidar "^3.5.3"
@@ -6951,11 +6951,16 @@ object-hash@^2.0.1:
69516951
resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5"
69526952
integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
69536953

6954-
object-inspect@^1.12.0, object-inspect@^1.12.2, object-inspect@^1.9.0:
6954+
object-inspect@^1.12.0, object-inspect@^1.9.0:
69556955
version "1.12.2"
69566956
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
69576957
integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
69586958

6959+
object-inspect@^1.12.2:
6960+
version "1.12.3"
6961+
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
6962+
integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
6963+
69596964
object-keys@^1.1.1:
69606965
version "1.1.1"
69616966
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -7239,10 +7244,10 @@ prelude-ls@^1.2.1:
72397244
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
72407245
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
72417246

7242-
prettier@^2.8.2:
7243-
version "2.8.2"
7244-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.2.tgz#c4ea1b5b454d7c4b59966db2e06ed7eec5dfd160"
7245-
integrity sha512-BtRV9BcncDyI2tsuS19zzhzoxD8Dh8LiCx7j7tHzrkz8GFXAexeWFdi22mjE1d16dftH2qNaytVxqiRTGlMfpw==
7247+
prettier@^2.8.3:
7248+
version "2.8.3"
7249+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.3.tgz#ab697b1d3dd46fb4626fbe2f543afe0cc98d8632"
7250+
integrity sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==
72467251

72477252
pretty-format@^29.0.0, pretty-format@^29.0.1:
72487253
version "29.0.1"
@@ -7476,6 +7481,11 @@ [email protected], rimraf@^3.0.2:
74767481
dependencies:
74777482
glob "^7.1.3"
74787483

7484+
rimraf@^4.0.4:
7485+
version "4.0.4"
7486+
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-4.0.4.tgz#8d0a91709fdc294d40f59c773f63c44e8dc878f1"
7487+
integrity sha512-R0hoVr9xTwemarQjoWlNt/nb5dEGVTBhVdkRmEX2zEkT8T6onH0XKiGjuaC7rNNj/gYzY2p4NVRJ3sjO1ascHQ==
7488+
74797489
rotating-file-stream@^3.0.4:
74807490
version "3.0.4"
74817491
resolved "https://registry.yarnpkg.com/rotating-file-stream/-/rotating-file-stream-3.0.4.tgz#158e21aa229020b1443607e771c634f00bd7bbf1"
@@ -8036,10 +8046,10 @@ triple-beam@^1.3.0:
80368046
resolved "https://registry.yarnpkg.com/true-myth/-/true-myth-4.1.1.tgz#ff4ac9d5130276e34aa338757e2416ec19248ba2"
80378047
integrity sha512-rqy30BSpxPznbbTcAcci90oZ1YR4DqvKcNXNerG5gQBU2v4jk0cygheiul5J6ExIMrgDVuanv/MkGfqZbKrNNg==
80388048

8039-
ts-jest@^29.0.4:
8040-
version "29.0.4"
8041-
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.0.4.tgz#9bc1fd0ec4d863f001af6c5c630e3a807df90f6d"
8042-
integrity sha512-YdNofkoyzeinwjIqLSYQeAM+GTmFQ7xFNtWcR5OyitY5VLzzNINrNmfhP5H3daA/V+RGQR7O3g1K6ysRgu5xIQ==
8049+
ts-jest@^29.0.5:
8050+
version "29.0.5"
8051+
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.0.5.tgz#c5557dcec8fe434fcb8b70c3e21c6b143bfce066"
8052+
integrity sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==
80438053
dependencies:
80448054
bs-logger "0.x"
80458055
fast-json-stable-stringify "2.x"

0 commit comments

Comments
 (0)