@nomalism-com/types 0.36.32 → 0.37.2

package/src/modules/user/bankData/route.schema.ts

@@ -1,40 +0,0 @@
-import joi from 'joi';
-import { messages } from '../../../shared/messages';
-import * as IShared from '../../../shared/interface';
-import { IFindRequest, IFindPaginatedRequest, ICreateRequest, IUpdateRequest } from './interface';
-
-// create body validation
-const createBodyKeys: IShared.IRouteRequest<ICreateRequest> = {
-  provider_id: joi.string(),
-  client_id: joi.string(),
-  store_operator_id: joi.string(),
-  commissioner_id: joi.string(),
-  iban: joi.string().required(),
-  swift_id: joi.string().allow(null).optional(),
-  country_id: joi.string().required(),
-};
-export const createBody = joi
-  .object()
-  .keys(createBodyKeys)
-  .xor('provider_id', 'client_id', 'store_operator_id', 'commissioner_id')
-  .messages(messages);
-
-// update body validation
-const updateBodyKeys: IShared.IRouteRequest<IUpdateRequest> = {
-  iban: joi.string().optional(),
-  swift_id: joi.string().allow(null).optional(),
-  country_id: joi.string().optional(),
-};
-export const updateBody = joi.object().keys(updateBodyKeys).messages(messages);
-const findQueryKeys: IShared.IRouteRequest<IFindRequest> = {};
-export const findQuery = joi.object().keys(findQueryKeys).messages(messages);
-
-// find with pagination query validation
-const findWithPaginationQueryKeys: IShared.IRouteRequest<IFindPaginatedRequest> = {
-  per_page: joi.number().integer().positive().default(10).optional(),
-  current_page: joi.number().integer().positive().default(1).optional(),
-};
-export const findWithPaginationQuery = joi
-  .object()
-  .keys(findWithPaginationQueryKeys)
-  .messages(messages);

package/src/modules/user/chatSubscribers/interfaces.ts

@@ -1,34 +0,0 @@
-import { ChatSubscriber } from './../../../shared/entities/user';
-import * as IShared from '../../../shared/interface';
-
-export type Entity = ChatSubscriber;
-export const Route = 'chat_subscriber';
-export const UpperName = 'ChatSubscriber';
-export const LowerName = UpperName[0].toLowerCase() + UpperName.substring(1);
-
-export interface ICreateOrUpdateRequest {
-  owner_id: string;
-  document_header_id: string;
-  personas_ids: string[];
-}
-
-export type IFindByIdResponse = {
-  persona_id: string;
-  name: string;
-  email: string;
-  phone_number: string | null;
-}[];
-
-export interface IRepository {
-  createOrUpdate(data: ICreateOrUpdateRequest): Promise<Entity[]>;
-
-  findByOwnerId(selector: IShared.IFindByIdRequest): Promise<IFindByIdResponse>;
-
-  findByDocumentHeaderId(selector: IShared.IFindByIdRequest): Promise<IFindByIdResponse>;
-
-  findByPersonaId(selector: IShared.IFindByIdRequest): Promise<IFindByIdResponse>;
-
-  deleteOne(selector: IShared.IFindByIdRequest): Promise<void>;
-}
-
-export type IController = IShared.IEntityWithUserToken<IRepository>;

package/src/modules/user/chatSubscribers/route.schema.ts

@@ -1,12 +0,0 @@
-import joi from 'joi';
-import { messages } from '../../../shared/messages';
-import * as IShared from '../../../shared/interface';
-import { ICreateOrUpdateRequest } from './interfaces';
-
-// create body validation
-const createOrUpdateBodyKeys: IShared.IRouteRequest<ICreateOrUpdateRequest> = {
-  owner_id: joi.string().uuid().required(),
-  document_header_id: joi.string().uuid().required(),
-  personas_ids: joi.array().items(joi.string().optional()).required(),
-};
-export const createOrUpdateBody = joi.object().keys(createOrUpdateBodyKeys).messages(messages);

package/src/modules/user/clientType/interface.ts

@@ -1,47 +0,0 @@
-import * as IShared from '../../../shared/interface';
-import { ClientType } from '../../../shared/entities/user';
-
-export type Entity = ClientType;
-export const Route = 'client_type';
-export const UpperName = 'ClientType';
-export const LowerName = UpperName[0].toLowerCase() + UpperName.substring(1);
-
-type IFindDetailedResponse = Entity;
-
-// omit any unnecessary fields
-export type IFindByIdResponse = Omit<IFindDetailedResponse, ''>;
-
-export type IFindRequest = Record<string, unknown>;
-
-// omit any unnecessary fields
-export type IFindResponse = Omit<IFindDetailedResponse, ''>;
-
-export interface IFindPaginatedRequest extends IFindRequest, IShared.IPaginationRequest {}
-
-export type IFindWithPaginationResponse = IShared.IPaginationResponse<
-  Omit<IFindDetailedResponse, ''>
->;
-
-export interface ICreateRequest {
-  // create fields
-  name: string;
-}
-
-export interface IUpdateRequest {
-  // updatable fields
-  name?: string;
-}
-
-export interface IRepository {
-  findById(selector: IShared.IFindByIdRequest): Promise<IFindByIdResponse | null>;
-
-  findMinified(params?: IShared.IFindMinifiedRequest): Promise<IShared.IFindMinifiedResponse[]>;
-  find(selector: IFindRequest): Promise<IFindResponse[]>;
-  findPaginated(selector: IFindPaginatedRequest): Promise<IFindWithPaginationResponse>;
-
-  create(data: ICreateRequest): Promise<Entity>;
-  update(selector: IShared.IFindByIdRequest, data: IUpdateRequest): Promise<Entity | null>;
-  deleteOne(selector: IShared.IFindByIdRequest): Promise<Entity | null>;
-}
-
-export type IController = IShared.IEntityWithUserToken<IRepository>;

package/src/modules/user/clientType/route.schema.ts

@@ -1,31 +0,0 @@
-import joi from 'joi';
-import { messages } from '../../../shared/messages';
-import * as IShared from '../../../shared/interface';
-import { IFindRequest, IFindPaginatedRequest, ICreateRequest, IUpdateRequest } from './interface';
-
-// create body validation
-const createBodyKeys: IShared.IRouteRequest<ICreateRequest> = {
-  name: joi.string().required(),
-};
-export const createBody = joi.object().keys(createBodyKeys).messages(messages);
-
-// update body validation
-const updateBodyKeys: IShared.IRouteRequest<IUpdateRequest> = {
-  name: joi.string().required(),
-};
-export const updateBody = joi.object().keys(updateBodyKeys).messages(messages);
-const findQueryKeys: IShared.IRouteRequest<IFindRequest> = {};
-export const findQuery = joi.object().keys(findQueryKeys).messages(messages);
-
-// find with pagination query validation
-const findWithPaginationQueryKeys: IShared.IRouteRequest<IFindPaginatedRequest> = {
-  per_page: joi.number().integer().positive().default(10).optional(),
-  current_page: joi.number().integer().positive().default(1).optional(),
-};
-export const findWithPaginationQuery = joi
-  .object()
-  .keys(findWithPaginationQueryKeys)
-  .messages(messages);
-export const clientTypePostSchema = joi.object().keys({
-  name: joi.string().required(),
-});

package/src/modules/user/clients/interface.ts

@@ -1,138 +0,0 @@
-import * as IShared from '../../../shared/interface';
-import {
-  Clients,
-  Users,
-  Country,
-  ReasonForExemption,
-  ClientType,
-  SegmentsArea,
-  Language,
-  Vehicles,
-  DeliveryMethods,
-  MaturityDates,
-  PaymentMethods,
-  Persona,
-} from '../../../shared/entities/user';
-import type { IChatType } from '../../stock/chat/interfaces';
-
-export type Entity = Clients;
-export const Route = 'client';
-export const UpperName = 'Clients';
-export const LowerName = UpperName[0].toLowerCase() + UpperName.substring(1);
-
-interface IMainPersona extends Persona {
-  country: Country | null;
-  reason_for_exemption: ReasonForExemption | null;
-}
-
-interface IFindDetailedResponse extends Entity {
-  user: Users;
-  main_persona: IMainPersona;
-  client_type: ClientType | null;
-  segments_area: SegmentsArea | null;
-  country: Country | null;
-  language: Language | null;
-  default_payment_method: PaymentMethods | null;
-  default_maturity_date: MaturityDates | null;
-  default_delivery_method: DeliveryMethods | null;
-  default_vehicle: Vehicles | null;
-}
-
-// omit any unnecessary fields
-export type IFindByIdResponse = Omit<IFindDetailedResponse, ''>;
-
-// omit any unnecessary fields
-export type IFindByOwnerIdResponse = Omit<
-  IFindDetailedResponse,
-  | 'user'
-  | 'main_persona'
-  | 'client_type'
-  | 'segments_area'
-  | 'country'
-  | 'language'
-  | 'default_payment_method'
-  | 'default_maturity_date'
-  | 'default_delivery_method'
-  | 'default_vehicle'
->;
-
-export interface IFindByQueryRequest {
-  number?: number[];
-  id?: string[];
-  nif?: string | null;
-}
-
-export interface IFindRequest {}
-
-// omit any unnecessary fields
-export type IFindResponse = Omit<IFindDetailedResponse, ''>;
-
-export interface IFindPaginatedRequest extends IFindRequest, IShared.IPaginationRequest {}
-
-export type IFindWithPaginationResponse = IShared.IPaginationResponse<
-  Omit<IFindDetailedResponse, ''>
->;
-
-export type ICreateMainPersona = Pick<Persona, 'nif' | 'name' | 'email' | 'telephone'>;
-
-export interface ICreateRequest {
-  user_id?: string;
-  main_persona: ICreateMainPersona;
-  deferred_payment?: boolean;
-  default_discount?: number;
-  exemption_reason_id?: string | null;
-  newsletter?: boolean;
-  inactive?: boolean;
-  country_id?: string | null;
-  language_id?: string | null;
-  client_type_id?: string | null;
-  segments_area_id?: string | null;
-  default_payment_method_id?: string | null;
-  default_maturity_date_id?: string | null;
-  default_delivery_method_id?: string | null;
-  default_vehicle_id?: string | null;
-}
-
-export interface IUpdateRequest {
-  // updatable fields
-  chat_type?: IChatType;
-  nif?: string | null;
-  country_id?: string | null;
-  language_id?: string | null;
-  client_type_id?: string | null;
-  newsletter?: boolean;
-  inactive?: boolean;
-  segments_area_id?: string | null;
-  main_persona_id?: string;
-  contact_persona_id?: string;
-  default_discount?: number;
-  default_payment_method_id?: string | null;
-  default_maturity_date_id?: string | null;
-  default_delivery_method_id?: string | null;
-  default_vehicle_id?: string | null;
-  deferred_payment?: boolean;
-}
-
-export interface IRepository {
-  findById(selector: IShared.IFindByIdRequest): Promise<IFindByIdResponse | null>;
-
-  findByOwnerId(params: IShared.IFindByOwnerIdRequest): Promise<IFindByOwnerIdResponse[]>;
-
-  findMinified(params?: IShared.IFindMinifiedRequest): Promise<IShared.IFindMinifiedResponse[]>;
-
-  findByQuery(params: IFindByQueryRequest): Promise<IFindResponse[]>;
-
-  find(selector: IFindRequest): Promise<IFindResponse[]>;
-
-  findPaginated(selector: IFindPaginatedRequest): Promise<IFindWithPaginationResponse>;
-
-  create(data: ICreateRequest): Promise<IFindResponse>;
-
-  createOrUpdate(data: ICreateRequest): Promise<IFindResponse>;
-
-  update(selector: IShared.IFindByIdRequest, data: IUpdateRequest): Promise<IFindResponse | null>;
-
-  deleteOne(selector: IShared.IFindByIdRequest): Promise<IFindResponse | null>;
-}
-
-export type IController = IShared.IEntityWithUserToken<IRepository>;

package/src/modules/user/clients/route.schema.ts

@@ -1,87 +0,0 @@
-import joi from 'joi';
-import { messages } from '../../../shared/messages';
-import * as IShared from '../../../shared/interface';
-import {
-  IFindPaginatedRequest,
-  ICreateRequest,
-  IUpdateRequest,
-  IFindByQueryRequest,
-  ICreateMainPersona,
-} from './interface';
-import { chatTypes } from '../../stock/chat/interfaces';
-
-const createMainPersonaKeys: IShared.IRouteRequest<ICreateMainPersona> = {
-  name: joi.string().allow(null, '').empty('').optional(),
-  nif: joi.string().allow(null, '').empty('').optional(),
-  email: joi
-    .string()
-    .email({ tlds: { allow: false } })
-    .allow(null, '')
-    .empty('')
-    .optional(),
-  telephone: joi.string().allow(null, '').empty('').optional(),
-};
-
-// create body validation
-const createBodyKeys: IShared.IRouteRequest<ICreateRequest> = {
-  user_id: joi.string().uuid().optional(),
-
-  main_persona: joi.object().keys(createMainPersonaKeys).optional(),
-
-  deferred_payment: joi.boolean().default(false).optional(),
-  default_discount: joi.number().positive().allow(0).default(0).max(100).optional(),
-  exemption_reason_id: joi.string().uuid().allow(null).optional(),
-
-  inactive: joi.boolean().default(false).optional(),
-  newsletter: joi.boolean().default(false).optional(),
-
-  country_id: joi.string().uuid().allow(null).optional(),
-  language_id: joi.string().uuid().allow(null).optional(),
-  client_type_id: joi.string().uuid().allow(null).optional(),
-  segments_area_id: joi.string().uuid().allow(null).optional(),
-  default_payment_method_id: joi.string().uuid().allow(null).optional(),
-  default_maturity_date_id: joi.string().uuid().allow(null).optional(),
-  default_delivery_method_id: joi.string().uuid().allow(null).optional(),
-  default_vehicle_id: joi.string().uuid().allow(null).optional(),
-};
-export const createBody = joi.object().keys(createBodyKeys).messages(messages);
-
-// update body validation
-const updateBodyKeys: IShared.IRouteRequest<IUpdateRequest> = {
-  chat_type: joi
-    .string()
-    .valid(...chatTypes)
-    .optional(),
-  main_persona_id: joi.string().uuid().optional(),
-  contact_persona_id: joi.string().uuid().optional(),
-  nif: joi.string().allow(null).optional(),
-  country_id: joi.string().uuid().allow(null).optional(),
-  language_id: joi.string().uuid().allow(null).optional(),
-  client_type_id: joi.string().uuid().allow(null).optional(),
-  newsletter: joi.boolean().optional(),
-  inactive: joi.boolean().optional(),
-  segments_area_id: joi.string().uuid().allow(null).optional(),
-  default_discount: joi.number().positive().allow(0).max(100).optional(),
-  default_payment_method_id: joi.string().uuid().allow(null).optional(),
-  default_maturity_date_id: joi.string().uuid().allow(null).optional(),
-  default_delivery_method_id: joi.string().uuid().allow(null).optional(),
-  default_vehicle_id: joi.string().uuid().allow(null).optional(),
-  deferred_payment: joi.boolean().optional(),
-};
-export const updateBody = joi.object().keys(updateBodyKeys).messages(messages);
-const findQueryKeys: IShared.IRouteRequest<IFindByQueryRequest> = {
-  number: joi.array().items(joi.number().positive().required()).optional(),
-  id: joi.array().items(joi.string().uuid().required()).optional(),
-  nif: joi.string().optional(),
-};
-export const findQuery = joi.object().keys(findQueryKeys).messages(messages);
-
-// find with pagination query validation
-const findWithPaginationQueryKeys: IShared.IRouteRequest<IFindPaginatedRequest> = {
-  per_page: joi.number().integer().positive().default(10).optional(),
-  current_page: joi.number().integer().positive().default(1).optional(),
-};
-export const findWithPaginationQuery = joi
-  .object()
-  .keys(findWithPaginationQueryKeys)
-  .messages(messages);

package/src/modules/user/commissioner/interface.ts

@@ -1,110 +0,0 @@
-import * as IShared from '../../../shared/interface';
-import {
-  type Commissioner,
-  type Users,
-  type Country,
-  type Language,
-  type PaymentMethods,
-  type DeliveryMethods,
-  type MaturityDates,
-  type Vehicles,
-  type Persona,
-  type ReasonForExemption,
-} from '../../../shared/entities/user';
-import type { IChatType } from '../../stock/chat/interfaces';
-
-export type Entity = Commissioner;
-export const Route = 'commissioner';
-export const UpperName = 'Commissioner';
-export const LowerName = UpperName[0].toLowerCase() + UpperName.substring(1);
-
-interface IMainPersona extends Persona {
-  country: Country | null;
-  reason_for_exemption: ReasonForExemption | null;
-}
-
-interface IFindDetailedResponse extends Entity {
-  user: Users;
-  main_persona: IMainPersona;
-  country: Country | null;
-  language: Language | null;
-  default_payment_method: PaymentMethods | null;
-  default_maturity_date: MaturityDates | null;
-  default_delivery_method: DeliveryMethods | null;
-  default_vehicle: Vehicles | null;
-}
-
-// omit any unnecessary fields
-export type IFindByIdResponse = Omit<IFindDetailedResponse, ''>;
-
-// omit any unnecessary fields
-export type IFindByOwnerIdResponse = Omit<
-  IFindDetailedResponse,
-  | 'user'
-  | 'main_persona'
-  | 'country'
-  | 'language'
-  | 'default_payment_method'
-  | 'default_maturity_date'
-  | 'default_delivery_method'
-  | 'default_vehicle'
->;
-
-export type IFindRequest = Record<string, unknown>;
-
-// omit any unnecessary fields
-export type IFindResponse = Omit<IFindDetailedResponse, ''>;
-
-export interface IFindPaginatedRequest extends IFindRequest, IShared.IPaginationRequest {}
-
-export type IFindWithPaginationResponse = IShared.IPaginationResponse<
-  Omit<IFindDetailedResponse, ''>
->;
-
-export type ICreateMainPersona = Pick<Persona, 'nif' | 'name' | 'email' | 'telephone'>;
-
-export interface ICreateRequest {
-  // create fields
-  user_id: string;
-
-  default_percentage?: number;
-  // exemption_reason_id?: string | null; // todo
-
-  main_persona: ICreateMainPersona;
-  country_id?: string | null;
-  language_id?: string | null;
-  default_payment_method_id?: string | null;
-  default_maturity_date_id?: string | null;
-  default_delivery_method_id?: string | null;
-  default_vehicle_id?: string | null;
-}
-
-export interface IUpdateRequest {
-  // updatable fields
-  chat_type?: IChatType;
-  default_percentage?: number;
-  // exemption_reason_id?: string | null; // todo
-  main_persona_id?: string;
-  contact_persona_id?: string;
-  country_id?: string | null;
-  language_id?: string | null;
-  default_payment_method_id?: string | null;
-  default_maturity_date_id?: string | null;
-  default_delivery_method_id?: string | null;
-  default_vehicle_id?: string | null;
-}
-
-export interface IRepository {
-  findById(selector: IShared.IFindByIdRequest): Promise<IFindByIdResponse | null>;
-
-  findByOwnerId(params: IShared.IFindByOwnerIdRequest): Promise<IFindByOwnerIdResponse[]>;
-  findMinified(params?: IShared.IFindMinifiedRequest): Promise<IShared.IFindMinifiedResponse[]>;
-  find(selector: IFindRequest): Promise<IFindResponse[]>;
-  findPaginated(selector: IFindPaginatedRequest): Promise<IFindWithPaginationResponse>;
-
-  create(data: ICreateRequest): Promise<IFindResponse>;
-  update(selector: IShared.IFindByIdRequest, data: IUpdateRequest): Promise<IFindResponse | null>;
-  deleteOne(selector: IShared.IFindByIdRequest): Promise<IFindResponse | null>;
-}
-
-export type IController = IShared.IEntityWithUserToken<IRepository>;

package/src/modules/user/commissioner/route.schema.ts

@@ -1,65 +0,0 @@
-import joi from 'joi';
-import { messages } from '../../../shared/messages';
-import * as IShared from '../../../shared/interface';
-import {
-  IFindRequest,
-  IFindPaginatedRequest,
-  ICreateRequest,
-  IUpdateRequest,
-  ICreateMainPersona,
-} from './interface';
-import { chatTypes } from '../../stock/chat/interfaces';
-
-const createMainPersonaKeys: IShared.IRouteRequest<ICreateMainPersona> = {
-  name: joi.string().optional(),
-  nif: joi.string().allow(null).optional(),
-  email: joi
-    .string()
-    .email({ tlds: { allow: false } })
-    .optional(),
-  telephone: joi.string().optional(),
-};
-
-// create body validation
-const createBodyKeys: IShared.IRouteRequest<ICreateRequest> = {
-  user_id: joi.string().uuid().required(),
-  default_percentage: joi.number().positive().allow(0).default(0).optional(),
-  main_persona: joi.object().keys(createMainPersonaKeys).required(),
-  country_id: joi.string().uuid().allow(null).optional(),
-  language_id: joi.string().uuid().allow(null).optional(),
-  default_payment_method_id: joi.string().uuid().allow(null).optional(),
-  default_maturity_date_id: joi.string().uuid().allow(null).optional(),
-  default_delivery_method_id: joi.string().uuid().allow(null).optional(),
-  default_vehicle_id: joi.string().uuid().allow(null).optional(),
-};
-export const createBody = joi.object().keys(createBodyKeys).messages(messages);
-
-// update body validation
-const updateBodyKeys: IShared.IRouteRequest<IUpdateRequest> = {
-  chat_type: joi
-    .string()
-    .valid(...chatTypes)
-    .optional(),
-  default_percentage: joi.number().positive().allow(0).optional(),
-  main_persona_id: joi.string().uuid().optional(),
-  contact_persona_id: joi.string().uuid().optional(),
-  country_id: joi.string().uuid().allow(null).optional(),
-  language_id: joi.string().uuid().allow(null).optional(),
-  default_payment_method_id: joi.string().uuid().allow(null).optional(),
-  default_maturity_date_id: joi.string().uuid().allow(null).optional(),
-  default_delivery_method_id: joi.string().uuid().allow(null).optional(),
-  default_vehicle_id: joi.string().uuid().allow(null).optional(),
-};
-export const updateBody = joi.object().keys(updateBodyKeys).messages(messages);
-const findQueryKeys: IShared.IRouteRequest<IFindRequest> = {};
-export const findQuery = joi.object().keys(findQueryKeys).messages(messages);
-
-// find with pagination query validation
-const findWithPaginationQueryKeys: IShared.IRouteRequest<IFindPaginatedRequest> = {
-  per_page: joi.number().integer().positive().default(10).optional(),
-  current_page: joi.number().integer().positive().default(1).optional(),
-};
-export const findWithPaginationQuery = joi
-  .object()
-  .keys(findWithPaginationQueryKeys)
-  .messages(messages);

package/src/modules/user/country/interface.ts

@@ -1,54 +0,0 @@
-import * as IShared from '../../../shared/interface';
-import { Country } from '../../../shared/entities/user';
-
-export type Entity = Country;
-export const Route = 'country';
-export const UpperName = 'Country';
-export const LowerName = UpperName[0].toLowerCase() + UpperName.substring(1);
-
-type IFindDetailedResponse = Entity;
-
-// omit any unnecessary fields
-export type IFindByIdResponse = Omit<IFindDetailedResponse, ''>;
-
-export type IFindRequest = {
-  name?: string;
-};
-
-// omit any unnecessary fields
-export type IFindResponse = Omit<IFindDetailedResponse, ''>;
-
-export interface IFindPaginatedRequest extends IFindRequest, IShared.IPaginationRequest {}
-
-export type IFindWithPaginationResponse = IShared.IPaginationResponse<
-  Omit<IFindDetailedResponse, ''>
->;
-
-export interface ICreateRequest {
-  // create fields
-  name: string;
-  alpha2: string;
-  external_id: string;
-}
-
-export interface IUpdateRequest {
-  // updatable fields
-  name?: string;
-  alpha2?: string;
-  external_id?: string;
-}
-
-export interface IRepository {
-  findById(selector: IShared.IFindByIdRequest): Promise<IFindByIdResponse | null>;
-
-  findMinified(params?: IShared.IFindMinifiedRequest): Promise<IShared.IFindMinifiedResponse[]>;
-  findByAlpha2(params?: IShared.IFindMinifiedRequest): Promise<IShared.IFindMinifiedResponse[]>;
-  find(selector: IFindRequest): Promise<IFindResponse[]>;
-  findPaginated(selector: IFindPaginatedRequest): Promise<IFindWithPaginationResponse>;
-
-  create(data: ICreateRequest): Promise<Entity>;
-  update(selector: IShared.IFindByIdRequest, data: IUpdateRequest): Promise<Entity | null>;
-  deleteOne(selector: IShared.IFindByIdRequest): Promise<Entity | null>;
-}
-
-export type IController = IShared.IEntityWithUserToken<IRepository>;