From 8f3d2bca81529621f8d1ff5bf586cec9a3ea3d9d Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Tue, 14 Nov 2023 14:14:37 +0000
Subject: [PATCH] chore: fix type errors
---
package-lock.json | 1 +
package.json | 1 +
src/mailer/mailer.service.spec.ts | 19 ++++++++++++++-----
src/posts/posts.service.ts | 2 +-
.../structures-import.service.spec.ts | 14 ++++++++++----
.../structures-search.service.spec.ts | 1 -
src/structures/services/structures.service.ts | 6 +++---
7 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index e0125c59b..626a195d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,6 +32,7 @@
"dotenv": "^16.0.3",
"ejs": "^3.1.8",
"form-data": "^4.0.0",
+ "lodash": "^4.17.21",
"luxon": "^1.25.0",
"migrate": "^1.8.0",
"mongoose": "^6.7.3",
diff --git a/package.json b/package.json
index 0222d89ec..84f7f9543 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
"dotenv": "^16.0.3",
"ejs": "^3.1.8",
"form-data": "^4.0.0",
+ "lodash": "^4.17.21",
"luxon": "^1.25.0",
"migrate": "^1.8.0",
"mongoose": "^6.7.3",
diff --git a/src/mailer/mailer.service.spec.ts b/src/mailer/mailer.service.spec.ts
index c6798f184..8ff808c83 100644
--- a/src/mailer/mailer.service.spec.ts
+++ b/src/mailer/mailer.service.spec.ts
@@ -9,16 +9,25 @@ import { MailerService } from './mailer.service';
describe('MailerService', () => {
let mailerService: MailerService;
- let httpService: HttpService;
+ const httpServiceMock = {
+ get: jest.fn(),
+ post: jest.fn(),
+ };
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
imports: [HttpModule],
- providers: [MailerService, ConfigurationService],
+ providers: [
+ MailerService,
+ ConfigurationService,
+ {
+ provide: HttpService,
+ useValue: httpServiceMock,
+ },
+ ],
}).compile();
mailerService = module.get<MailerService>(MailerService);
- httpService = module.get<HttpService>(HttpService);
});
it('should be defined', () => {
@@ -40,7 +49,7 @@ describe('MailerService', () => {
headers: {},
config: {},
};
- jest.spyOn(httpService, 'post').mockImplementationOnce(() => of(result));
+ httpServiceMock.post.mockImplementationOnce(() => of(result));
expect(await mailerService.send('a@a.com', 'test', '<p>This is a test</p>')).toBe(result.data);
});
@@ -58,7 +67,7 @@ describe('MailerService', () => {
headers: {},
config: {},
};
- jest.spyOn(httpService, 'post').mockImplementationOnce(() => throwError(result));
+ httpServiceMock.post.mockImplementationOnce(() => throwError(result));
try {
await mailerService.send('a@a.com', 'test', '<p>This is a test</p>');
} catch (e) {
diff --git a/src/posts/posts.service.ts b/src/posts/posts.service.ts
index 34e32b576..e0480d721 100644
--- a/src/posts/posts.service.ts
+++ b/src/posts/posts.service.ts
@@ -26,7 +26,7 @@ export class PostsService {
/**
* Get all tags with admin endpoint, including unused ones
*/
- public getTags(): Promise<Tag[]> {
+ public async getTags(): Promise<Tag[]> {
return this.api.tags.browse({ limit: 'all' });
}
diff --git a/src/structures/services/structures-import.service.spec.ts b/src/structures/services/structures-import.service.spec.ts
index 60d5d6e73..f910e46d1 100644
--- a/src/structures/services/structures-import.service.spec.ts
+++ b/src/structures/services/structures-import.service.spec.ts
@@ -12,11 +12,14 @@ import { StructuresImportService } from './structures-import.service';
describe('StructuresImportService', () => {
let structuresImportService: StructuresImportService;
- let httpService: HttpService;
let structuresSearchService: StructuresSearchService;
let structuresService: StructuresService;
let mailerService: MailerService;
+ const httpServiceMock = {
+ get: jest.fn(),
+ };
+
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [
@@ -58,11 +61,14 @@ describe('StructuresImportService', () => {
save: jest.fn(),
},
},
+ {
+ provide: HttpService,
+ useValue: httpServiceMock,
+ },
],
}).compile();
structuresImportService = module.get<StructuresImportService>(StructuresImportService);
- httpService = module.get<HttpService>(HttpService);
structuresSearchService = module.get<StructuresSearchService>(StructuresSearchService);
structuresService = module.get<StructuresService>(StructuresService);
mailerService = module.get<MailerService>(MailerService);
@@ -90,7 +96,7 @@ describe('StructuresImportService', () => {
const doesAlreadyExistSpy = jest
.spyOn(structuresImportService as any, 'doesAlreadyExist')
.mockResolvedValueOnce(false);
- jest.spyOn(httpService, 'get').mockImplementationOnce(() => of(mockedAxiosResponse));
+ httpServiceMock.get.mockImplementationOnce(() => of(mockedAxiosResponse));
jest.spyOn(structuresSearchService, 'indexStructure').mockResolvedValueOnce(undefined);
@@ -98,7 +104,7 @@ describe('StructuresImportService', () => {
await structuresImportService.importDataGouvStructures();
- expect(httpService.get).toBeCalled();
+ expect(httpServiceMock.get).toBeCalled();
expect(formatToResinSchemaSpy).toBeCalled();
expect(doesAlreadyExistSpy).toBeCalled();
expect(saveSpy).toBeCalled();
diff --git a/src/structures/services/structures-search.service.spec.ts b/src/structures/services/structures-search.service.spec.ts
index 670e459fc..813c602fd 100644
--- a/src/structures/services/structures-search.service.spec.ts
+++ b/src/structures/services/structures-search.service.spec.ts
@@ -43,7 +43,6 @@ describe('StructuresSearchService', () => {
it('should be defined', () => {
expect(structureSearchService).toBeDefined();
- expect(structureSearchService).toBeDefined();
});
describe('search method', () => {
diff --git a/src/structures/services/structures.service.ts b/src/structures/services/structures.service.ts
index acc58a041..aa381e2b4 100644
--- a/src/structures/services/structures.service.ts
+++ b/src/structures/services/structures.service.ts
@@ -1099,9 +1099,9 @@ export class StructuresService {
*/
public getCNFSStructures(): Promise<Array<CNFSStructure>> {
this.logger.debug(`get CNFS structures`);
- const obs = this.httpService.get('https://api.conseiller-numerique.gouv.fr/permanences').pipe(
- map((response: AxiosResponse<Array<CNFSStructure>>) =>
- response.data.filter((structure: CNFSStructure) => {
+ const obs = this.httpService.get<Array<CNFSStructure>>('https://api.conseiller-numerique.gouv.fr/permanences').pipe(
+ map((response) =>
+ response.data.filter((structure) => {
if (structure.code_postal.substring(0, 2) === '69' && (structure.courriel || structure.telephone))
return structure;
})
--
GitLab