fix more omnichannel.ts json schemas (work in progress)

RocketChat · May 25, 2022 · 8f93798 · 8f93798
1 parent c187396
commit 8f93798
Show file tree

Hide file tree

Showing 2 changed files with 418 additions and 67 deletions.
diff --git a/packages/rest-typings/src/v1/directory.ts b/packages/rest-typings/src/v1/directory.ts
@@ -1,40 +1,33 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import Ajv, { JSONSchemaType } from 'ajv';
+import Ajv from 'ajv';
 
+import type { PaginatedRequest } from '../helpers/PaginatedRequest';
 import type { PaginatedResult } from '../helpers/PaginatedResult';
 
 const ajv = new Ajv();
 
-type DirectoryProps = {
-	query: {}; // { [key: string]: number }
-	count: number;
-	offset: number;
-	sort: {}; // { [key: string]: number }
-};
+type DirectoryProps = PaginatedRequest<{}>;
 
-const DirectorySchema: JSONSchemaType<DirectoryProps> = {
+const DirectorySchema = {
 	type: 'object',
 	properties: {
 		query: {
-			type: 'object',
-			properties: {
-				type: 'number',
-			},
+			type: 'string',
+			nullable: true,
 		},
 		count: {
 			type: 'number',
+			nullable: true,
 		},
 		offset: {
 			type: 'number',
+			nullable: true,
 		},
 		sort: {
-			type: 'object',
-			properties: {
-				type: 'number',
-			},
+			type: 'string',
+			nullable: true,
 		},
 	},
-	required: ['query', 'count', 'offset', 'sort'],
 	additionalProperties: false,
 };