From b62762851345e08d09cde924bc961ecca3123f16 Mon Sep 17 00:00:00 2001
From: Antonin Coquet <ext.sopra.acoquet@grandlyon.com>
Date: Thu, 29 Apr 2021 14:22:09 +0200
Subject: [PATCH] fix: changes after review
---
src/admin/admin.controller.ts | 3 ++-
src/newsletter/newsletter.service.ts | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/admin/admin.controller.ts b/src/admin/admin.controller.ts
index b3b650fac..999c6d949 100644
--- a/src/admin/admin.controller.ts
+++ b/src/admin/admin.controller.ts
@@ -2,6 +2,7 @@ import { Body, Delete, Param } from '@nestjs/common';
import { Controller, Get, Post, UseGuards } from '@nestjs/common';
import { ApiOperation, ApiParam } from '@nestjs/swagger';
import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
+import { NewsletterSubscriptionDocument } from '../newsletter/newsletter-subscription.schema';
import { NewsletterService } from '../newsletter/newsletter.service';
import { StructuresService } from '../structures/services/structures.service';
import { Roles } from '../users/decorators/roles.decorator';
@@ -114,7 +115,7 @@ export class AdminController {
@UseGuards(JwtAuthGuard, RolesGuard)
@Roles('admin')
@Get('countNewsletterSubscriptions')
- public async countNewsletterSubscriptions() {
+ public async countNewsletterSubscriptions(): Promise<number> {
return this.newsletterService.countNewsletterSubscriptions();
}
diff --git a/src/newsletter/newsletter.service.ts b/src/newsletter/newsletter.service.ts
index 16c9d08f1..57dab32d1 100644
--- a/src/newsletter/newsletter.service.ts
+++ b/src/newsletter/newsletter.service.ts
@@ -2,7 +2,7 @@ import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
import { InjectModel } from '@nestjs/mongoose';
import { Model, Types } from 'mongoose';
import { INewsletterSubscription } from './interface/newsletter-subscription.interface';
-import { NewsletterSubscription } from './newsletter-subscription.schema';
+import { NewsletterSubscription, NewsletterSubscriptionDocument } from './newsletter-subscription.schema';
@Injectable()
export class NewsletterService {
@@ -32,12 +32,12 @@ export class NewsletterService {
return this.newsletterSubscriptionModel.findOne({ email: mail }).exec();
}
- public async searchNewsletterSubscription(searchString: string) {
+ public async searchNewsletterSubscription(searchString: string): Promise<NewsletterSubscriptionDocument[]> {
return this.newsletterSubscriptionModel.find({ email: new RegExp(searchString, 'i') }).exec();
}
- public async countNewsletterSubscriptions() {
- return this.newsletterSubscriptionModel.count({}).exec();
+ public async countNewsletterSubscriptions(): Promise<number> {
+ return this.newsletterSubscriptionModel.countDocuments({}).exec();
}
public async deleteOneEmail(mail: string): Promise<NewsletterSubscription | undefined> {
--
GitLab