Просмотр исходного кода

Make use of generic custom request to guarantee limit and offset types

arvid-e 5 месяцев назад
Родитель
Сommit
a2aa6c1e37
1 измененных файлов с 10 добавлено и 6 удалено
  1. 10 6
      apps/app/src/server/routes/apiv3/user-activities.ts

+ 10 - 6
apps/app/src/server/routes/apiv3/user-activities.ts

@@ -30,19 +30,23 @@ const validator = {
   ],
 };
 
-type BaseParsedQs = Request['query'];
-type BaseRequest = Omit<Request, 'query'>;
-
 interface StrictActivityQuery {
   limit?: number;
   offset?: number;
   searchFilter?: string;
 }
 
-interface AuthorizedRequest extends BaseRequest {
+type CustomRequest<
+  TQuery = Request['query'],
+  TBody = any,
+  TParams = any
+> = Omit<Request<TParams, any, TBody, TQuery>, 'query'> & {
+    query: TQuery & Request['query'];
     user?: IUserHasId;
-    query: StrictActivityQuery & BaseParsedQs;
-}
+};
+
+type AuthorizedRequest = CustomRequest<StrictActivityQuery>;
+
 
 /**
  * @swagger