refactor: updated types for mongoose models

bluehalo · Jul 17, 2024 · b241a12 · b241a12
1 parent 0b53393
commit b241a12
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 8 deletions.
diff --git a/src/app/common/mongoose/paginate.plugin.ts b/src/app/common/mongoose/paginate.plugin.ts
@@ -8,7 +8,7 @@ export interface PagingResults<DocType> {
 	pageSize: number;
 	totalPages: number;
 	totalSize: number;
-	elements: HydratedDocument<DocType>[];
+	elements: DocType[];
 }
 
 export interface Paginateable<DocType> {

diff --git a/src/app/core/access-checker/cache/cache-entry.model.ts b/src/app/core/access-checker/cache/cache-entry.model.ts
@@ -24,7 +24,8 @@ export interface ICacheEntryMethods {
 
 export type CacheEntryDocument = HydratedDocument<
 	ICacheEntry,
-	ICacheEntryMethods
+	ICacheEntryMethods,
+	ICacheEntryQueryHelpers
 >;
 
 type ICacheEntryQueryHelpers = ContainsSearchable &

diff --git a/src/app/core/audit/audit.model.ts b/src/app/core/audit/audit.model.ts
@@ -27,7 +27,11 @@ interface IAudit {
 	};
 }
 
-export type AuditDocument = HydratedDocument<IAudit>;
+export type AuditDocument = HydratedDocument<
+	IAudit,
+	NonNullable<unknown>,
+	IAuditQueryHelpers
+>;
 
 type IAuditQueryHelpers = ContainsSearchable & Paginateable<AuditDocument>;
 

diff --git a/src/app/core/feedback/feedback.model.ts b/src/app/core/feedback/feedback.model.ts
@@ -33,7 +33,11 @@ export interface IFeedback {
 	updated: Date;
 }
 
-export type FeedbackDocument = HydratedDocument<IFeedback>;
+export type FeedbackDocument = HydratedDocument<
+	IFeedback,
+	NonNullable<unknown>,
+	IFeedbackQueryHelpers
+>;
 
 type IFeedbackQueryHelpers = TextSearchable & Paginateable<FeedbackDocument>;
 

diff --git a/src/app/core/messages/dismissed-message.model.ts b/src/app/core/messages/dismissed-message.model.ts
@@ -18,7 +18,8 @@ export interface IDismissedMessageMethods {
 
 export type DismissedMessageDocument = HydratedDocument<
 	IDismissedMessage,
-	IDismissedMessageMethods
+	IDismissedMessageMethods,
+	IDismissedMessageQueryHelpers
 >;
 
 type IDismissedMessageQueryHelpers = TextSearchable &

diff --git a/src/app/core/messages/message.model.ts b/src/app/core/messages/message.model.ts
@@ -33,7 +33,11 @@ export interface IMessageMethods {
 	fullCopy(): Record<string, unknown>;
 }
 
-export type MessageDocument = HydratedDocument<IMessage, IMessageMethods>;
+export type MessageDocument = HydratedDocument<
+	IMessage,
+	IMessageMethods,
+	IMessageQueryHelpers
+>;
 
 type IMessageQueryHelpers = TextSearchable & Paginateable<MessageDocument>;
 

diff --git a/src/app/core/notifications/notification.model.ts b/src/app/core/notifications/notification.model.ts
@@ -24,7 +24,8 @@ export interface INotificationMethods {
 
 export type NotificationDocument = HydratedDocument<
 	INotification,
-	INotificationMethods
+	INotificationMethods,
+	INotificationQueryHelpers
 >;
 
 type INotificationQueryHelpers = Paginateable<NotificationDocument>;

diff --git a/src/app/core/teams/team.model.ts b/src/app/core/teams/team.model.ts
@@ -37,7 +37,11 @@ export interface ITeamMethods {
 	auditCopyTeamMember(user: UserDocument): Record<string, unknown>;
 }
 
-export type TeamDocument = HydratedDocument<ITeam, ITeamMethods>;
+export type TeamDocument = HydratedDocument<
+	ITeam,
+	ITeamMethods,
+	ITeamQueryHelpers
+>;
 
 type ITeamQueryHelpers = ContainsSearchable & Paginateable<TeamDocument>;