Merge branch 'dev' into 'staging'

feat: optional tariff price

See merge request pena-services/hub_admin_backend_service!39

src/handlers/tariff/helpers.ts

@@ -4,17 +4,13 @@ import type { TariffMessage } from "@/types/messages/tariff-message.type";
 import type { ObjectWithRequiredFields } from "@/types/object-with-required-fields";
 
 export const validateTariff = (tariff?: TariffMessage): [ObjectWithRequiredFields<TariffMessage>, Error | null] => {
-  const [validatedTariff, errorEmpty] = validateEmptyFields(
+  const [validatedTariff, errorEmpty] = validateEmptyFields(tariff ?? {}, ["isCustom", "name", "privilegies"], false);
-    tariff ?? {},
-    ["isCustom", "name", "price", "privilegies"],
-    false
-  );
 
   if (errorEmpty) {
     return [validatedTariff, errorEmpty];
   }
 
-  if (isNaN(Number(validatedTariff.price))) {
+  if (validatedTariff.price && isNaN(Number(validatedTariff.price))) {
     return [validatedTariff, new Error("invalid 'price' value")];
   }
 

src/models/tariff.model.ts

@@ -12,7 +12,7 @@ const schema: SchemaDefinition<Tariff> = {
   },
   price: {
     type: Number,
-    required: true,
+    required: false,
   },
   isCustom: {
     type: Boolean,

src/swagger/tariff/inputs.ts

@@ -29,7 +29,7 @@ export const getTariffsQuerystring: SwaggerMessage = {
 export const tariffBody: SwaggerMessage = {
   type: "object",
   description: "Тариф",
-  required: ["name", "price", "isCustom", "privilegies"],
+  required: ["name", "isCustom", "privilegies"],
   properties: {
     name: { type: "string" },
     price: { type: "number" },

src/types/models/tariff.type.ts

@@ -3,7 +3,7 @@ import type { Eloquent } from "./eloquent.type";
 
 export type Tariff = Eloquent & {
   name: string;
-  price: number;
+  price?: number;
   isCustom: boolean;
   privilegies: Array<Omit<Privilege, keyof Eloquent>>;
 };