From 8b17c4bd5489b698373fc2020afd97a1736db1c8 Mon Sep 17 00:00:00 2001
From: Ivan Alglave <ivanalglave@outlook.fr>
Date: Thu, 10 Nov 2022 13:15:49 +0100
Subject: [PATCH] Changed findAll to use Promise and return actual group JSON
object and not observer containing the object
---
src/groups/dao/groups.dao.ts | 9 +++++++--
src/groups/groups.controller.ts | 2 +-
src/groups/groups.service.ts | 7 +------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/groups/dao/groups.dao.ts b/src/groups/dao/groups.dao.ts
index 2e053bb..e4e557f 100644
--- a/src/groups/dao/groups.dao.ts
+++ b/src/groups/dao/groups.dao.ts
@@ -13,8 +13,13 @@ export class GroupsDao {
private readonly _groupModel: Model<Group>,
) {}
- find = (): Observable<Group[]> =>
- from(this._groupModel.find({})).pipe(map((groups) => [].concat(groups)));
+ find = (): Promise<Group[]> =>
+ new Promise((resolve, reject) => {
+ this._groupModel.find({}, {}, {}, (err, value) => {
+ if (err) reject(err.message);
+ resolve(value);
+ });
+ });
findById = (id: string): Observable<Group | void> =>
from(this._groupModel.findById(id));
diff --git a/src/groups/groups.controller.ts b/src/groups/groups.controller.ts
index 191fe59..c9be042 100644
--- a/src/groups/groups.controller.ts
+++ b/src/groups/groups.controller.ts
@@ -18,7 +18,7 @@ export class GroupsController {
constructor(private readonly _groupsService: GroupsService) {}
@Get()
- findAll(): Observable<GroupEntity[] | void> {
+ findAll(): Promise<GroupEntity[] | void> {
return this._groupsService.findAll();
}
diff --git a/src/groups/groups.service.ts b/src/groups/groups.service.ts
index 798420c..dc8cf5d 100644
--- a/src/groups/groups.service.ts
+++ b/src/groups/groups.service.ts
@@ -23,12 +23,7 @@ import { GroupEntity } from './entities/group.entity';
export class GroupsService {
constructor(private readonly _groupsDao: GroupsDao) {}
- findAll = (): Observable<GroupEntity[] | void> =>
- this._groupsDao.find().pipe(
- filter(Boolean),
- map((groups) => (groups || []).map((group) => new GroupEntity(group))),
- defaultIfEmpty(undefined),
- );
+ findAll = (): Promise<GroupEntity[] | void> => this._groupsDao.find();
findOne = (id: string): Observable<GroupEntity> =>
this._groupsDao.findById(id).pipe(
--
GitLab