hh-contracts 0.0.97 → 0.0.98

package/TODO.md

@@ -0,0 +1 @@
+Вернуться в схему бд для permission и понять что лучше jsom или jsonb

package/build/hotels/hotel.models.js

@@ -38,17 +38,17 @@ const z = __importStar(require("zod"));
 const common_1 = require("../common");
 exports.HotelSchema = z.object({
     slug: common_1.SlugSchema,
-    chainId: common_1.UuidSchema.optional(),
+    chainId: common_1.UuidSchema.nullable().optional(),
     status: z.enum(common_1.AppStatuses.HOTEL_VALUES).optional(), // сервер может проставить дефолт
-    category: z.string().min(1).max(64).optional(),
+    category: z.string().min(1).max(64).nullable().optional(),
     timezone: common_1.TimezoneSchema,
     currency: z.string().length(3),
     defaultLang: z.enum(common_1.LANGUAGE_KEYS),
     availableLangs: z.array(z.enum(common_1.LANGUAGE_KEYS)),
-    stars: z.number().int().min(1).max(5).optional(),
+    stars: z.number().int().min(1).max(5).nullable().optional(),
     checkInFrom: common_1.IsoTimeSchema,
     checkOutUntil: common_1.IsoTimeSchema,
-    metadata: z.record(z.string(), z.unknown()).optional(),
+    metadata: z.record(z.string(), z.unknown()).nullable().optional(),
 });
 exports.HotelPersistedSchema = exports.HotelSchema.required({ status: true }).extend({
     id: common_1.UuidSchema,

package/build/hotels/integrations/contracts/find-all-hotel-integrations.contract.js

@@ -43,5 +43,6 @@ var FindAllHotelIntegrationsContract;
     FindAllHotelIntegrationsContract.getUrl = hotel_integrations_api_1.HOTEL_INTEGRATIONS_API.findAll;
     FindAllHotelIntegrationsContract.endpoint = hotel_integrations_api_1.HOTEL_INTEGRATIONS_CONTROLLER.endpoints.findAll;
     FindAllHotelIntegrationsContract.httpMethod = common_1.HTTP_METHODS.get;
+    FindAllHotelIntegrationsContract.RequestSchema = common_1.SearchSchema;
     FindAllHotelIntegrationsContract.ResponseSchema = z.array(hotel_integration_model_1.HotelIntegrationSchema);
 })(FindAllHotelIntegrationsContract || (exports.FindAllHotelIntegrationsContract = FindAllHotelIntegrationsContract = {}));

package/build/hotels/integrations/hotel-integration.model.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HotelIntegrationCredentialSchema = exports.HotelIntegrationConnectionSchema = exports.HotelIntegrationHotelSchema = exports.HotelIntegrationDetailSchema = exports.HotelIntegrationWriteSchema = exports.HotelIntegrationPersistedSchema = exports.HotelIntegrationSchema = exports.HotelIntegrationConfigSchema = void 0;
+exports.HotelIntegrationCredentialSchema = exports.HotelIntegrationConnectionSchema = exports.HotelIntegrationAssignSchema = exports.HotelIntegrationDetailSchema = exports.HotelIntegrationWriteSchema = exports.HotelIntegrationPersistedSchema = exports.HotelIntegrationSchema = exports.HotelIntegrationConfigSchema = void 0;
 const z = __importStar(require("zod"));
 const common_1 = require("../../common");
 const constants_1 = require("../constants");
@@ -59,7 +59,7 @@ exports.HotelIntegrationDetailSchema = exports.HotelIntegrationPersistedSchema.o
     secretHash: true,
     secretSalt: true,
 });
-exports.HotelIntegrationHotelSchema = z
+exports.HotelIntegrationAssignSchema = z
     .object({
     id: z.uuid(),
     integrationId: z.uuid(),

package/build/permissions/permission.models.js

@@ -36,12 +36,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PermissionListItemSchema = exports.PermissionDetailSchema = exports.PermissionWriteSchema = exports.PermissionTranslationsSchema = exports.PermissionPersistedSchema = exports.PermissionSchema = void 0;
 const z = __importStar(require("zod"));
 const common_1 = require("../common");
+const permisson_conditions_model_1 = require("./permisson-conditions.model");
 exports.PermissionSchema = z.object({
     action: z.enum(common_1.AppAbility.ACTION_VALUES),
     subject: z.enum(common_1.AppAbility.SUBJECT_VALUES),
-    conditions: z.json().nullable().optional(),
+    conditions: permisson_conditions_model_1.PermissionConditionFlagsSchema,
 });
-exports.PermissionPersistedSchema = exports.PermissionSchema.required({ conditions: true }).extend({
+exports.PermissionPersistedSchema = exports.PermissionSchema.extend({
     id: common_1.UuidSchema,
     ...common_1.TimestampSchema.shape,
 });

package/build/permissions/permisson-conditions.model.js

@@ -0,0 +1,41 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PermissionConditionFlagsSchema = void 0;
+const z = __importStar(require("zod"));
+exports.PermissionConditionFlagsSchema = z.object({
+    hotelFilter: z.boolean().default(false),
+    userFilter: z.boolean().default(false),
+});

package/hotels/hotel.models.ts

@@ -12,17 +12,17 @@ import {
 
 export const HotelSchema = z.object({
   slug: SlugSchema,
-  chainId: UuidSchema.optional(),
+  chainId: UuidSchema.nullable().optional(),
   status: z.enum(AppStatuses.HOTEL_VALUES).optional(), // сервер может проставить дефолт
-  category: z.string().min(1).max(64).optional(),
+  category: z.string().min(1).max(64).nullable().optional(),
   timezone: TimezoneSchema,
   currency: z.string().length(3),
   defaultLang: z.enum(LANGUAGE_KEYS),
   availableLangs: z.array(z.enum(LANGUAGE_KEYS)),
-  stars: z.number().int().min(1).max(5).optional(),
+  stars: z.number().int().min(1).max(5).nullable().optional(),
   checkInFrom: IsoTimeSchema,
   checkOutUntil: IsoTimeSchema,
-  metadata: z.record(z.string(), z.unknown()).optional(),
+  metadata: z.record(z.string(), z.unknown()).nullable().optional(),
 });
 export type THotel = z.infer<typeof HotelSchema>;
 

package/hotels/integrations/contracts/find-all-hotel-integrations.contract.ts

@@ -1,5 +1,5 @@
 import * as z from 'zod';
-import { HTTP_METHODS } from '../../../common';
+import { HTTP_METHODS, SearchSchema } from '../../../common';
 import { HOTEL_INTEGRATIONS_API, HOTEL_INTEGRATIONS_CONTROLLER } from '../hotel-integrations.api';
 import { HotelIntegrationSchema } from '../hotel-integration.model';
 
@@ -8,6 +8,9 @@ export namespace FindAllHotelIntegrationsContract {
   export const endpoint = HOTEL_INTEGRATIONS_CONTROLLER.endpoints.findAll;
   export const httpMethod = HTTP_METHODS.get;
 
+  export const RequestSchema = SearchSchema;
+  export type TRequest = z.infer<typeof RequestSchema>;
+
   export const ResponseSchema = z.array(HotelIntegrationSchema);
   export type TResponse = z.infer<typeof ResponseSchema>;
 

package/hotels/integrations/hotel-integration.model.ts

@@ -37,7 +37,7 @@ export const HotelIntegrationDetailSchema = HotelIntegrationPersistedSchema.omit
 });
 export type THotelIntegrationDetail = z.infer<typeof HotelIntegrationDetailSchema>;
 
-export const HotelIntegrationHotelSchema = z
+export const HotelIntegrationAssignSchema = z
   .object({
     id: z.uuid(),
     integrationId: z.uuid(),
@@ -46,7 +46,7 @@ export const HotelIntegrationHotelSchema = z
     isActive: z.boolean().default(true),
   })
   .extend(TimestampSchema.shape);
-export type THotelIntegrationHotel = z.infer<typeof HotelIntegrationHotelSchema>;
+export type THotelIntegrationAssign = z.infer<typeof HotelIntegrationAssignSchema>;
 
 export const HotelIntegrationConnectionSchema = z
   .object({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hh-contracts",
-  "version": "0.0.97",
+  "version": "0.0.98",
   "description": "",
   "main": "./build/index.js",
   "scripts": {

package/permissions/permission.models.ts

@@ -1,14 +1,15 @@
 import * as z from 'zod';
 import { AppAbility, TimestampSchema, UuidSchema, makeTranslations } from '../common';
+import { PermissionConditionFlagsSchema } from './permisson-conditions.model';
 
 export const PermissionSchema = z.object({
   action: z.enum(AppAbility.ACTION_VALUES),
   subject: z.enum(AppAbility.SUBJECT_VALUES),
-  conditions: z.json().nullable().optional(),
+  conditions: PermissionConditionFlagsSchema,
 });
 export type TPermission = z.infer<typeof PermissionSchema>;
 
-export const PermissionPersistedSchema = PermissionSchema.required({ conditions: true }).extend({
+export const PermissionPersistedSchema = PermissionSchema.extend({
   id: UuidSchema,
   ...TimestampSchema.shape,
 });

package/permissions/permisson-conditions.model.ts

@@ -0,0 +1,7 @@
+import * as z from 'zod';
+
+export const PermissionConditionFlagsSchema = z.object({
+  hotelFilter: z.boolean().default(false),
+  userFilter: z.boolean().default(false),
+});
+export type TPermissionConditionFlags = z.infer<typeof PermissionConditionFlagsSchema>;