Merge branch 'main' of git.savefamilygps.net:SaveFamily/sf-sim into WEBINT-175_visualaizacion_tareas_sim
This commit is contained in:
@@ -62,11 +62,14 @@ export type CreateOrderDTO = Pick<
|
||||
'correlation_id' | 'exchange' | 'routing_key' | 'order_type' | 'payload' | 'webhook_host' | 'webhook_endpoint'
|
||||
>;
|
||||
|
||||
export type UpdateOrderDTO =
|
||||
type IdOrCorrelationID =
|
||||
(
|
||||
{ id: number, correlation_id?: never } |
|
||||
{ id?: never, correlation_id: string }
|
||||
)
|
||||
|
||||
export type UpdateOrderDTO =
|
||||
IdOrCorrelationID
|
||||
&
|
||||
{
|
||||
new_status: OrderStatus,
|
||||
@@ -74,12 +77,21 @@ export type UpdateOrderDTO =
|
||||
}
|
||||
|
||||
export type FinishOrderDTO =
|
||||
(
|
||||
{ id: number, correlation_id?: never } |
|
||||
{ id?: never, correlation_id: string }
|
||||
)
|
||||
IdOrCorrelationID
|
||||
&
|
||||
{
|
||||
reason?: string
|
||||
reason?: string,
|
||||
end_date?: Date
|
||||
}
|
||||
|
||||
export type ErrorOrderDTO =
|
||||
IdOrCorrelationID
|
||||
&
|
||||
{
|
||||
status: "failed" | "dlx",
|
||||
reason: string,
|
||||
error?: string,
|
||||
stackTrace?: string
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ export type Failure<E = Error> = {
|
||||
*/
|
||||
export type Result<E, D> = Failure<E> | Success<D>
|
||||
|
||||
export async function tryCatch<T>(func: Promise<T>): Promise<Result<{ msg: Error }, T>> {
|
||||
export async function tryCatch<T>(func: Promise<T>): Promise<Result<Error, T>> {
|
||||
try {
|
||||
const res = await func;
|
||||
return {
|
||||
@@ -22,9 +22,8 @@ export async function tryCatch<T>(func: Promise<T>): Promise<Result<{ msg: Error
|
||||
}
|
||||
} catch (e: unknown) {
|
||||
return {
|
||||
error: {
|
||||
msg: e as Error
|
||||
}
|
||||
error: e as Error
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ export namespace SimEvents {
|
||||
}
|
||||
|
||||
export type reActivation = DomainEvent & {
|
||||
key: `sim.${string}.reActivate`,
|
||||
key: `sim.${string}.reactivate`,
|
||||
payload: {
|
||||
iccid: string
|
||||
},
|
||||
|
||||
144
packages/sim-shared/domain/objeniousLine.ts
Normal file
144
packages/sim-shared/domain/objeniousLine.ts
Normal file
@@ -0,0 +1,144 @@
|
||||
export type ObjeniousLineResponse = {
|
||||
content: ObjeniousLine[],
|
||||
offset: number,
|
||||
pageNumber: number,
|
||||
pageSize: number,
|
||||
paged: boolean,
|
||||
totalPages: number,
|
||||
totalElements: number
|
||||
}
|
||||
|
||||
export type ObjeniousLine = {
|
||||
identifier: {
|
||||
simId: number,
|
||||
iccid: string,
|
||||
imsi: string,
|
||||
msisdn: string,
|
||||
amsisdn?: string,
|
||||
imei: string
|
||||
},
|
||||
simCardType: {
|
||||
code: string,
|
||||
description: string
|
||||
},
|
||||
device: {
|
||||
imei: string,
|
||||
imeiChangeDate: string, //Fecha iso
|
||||
deviceReference?: string | null,
|
||||
manufacturer?: string | null,
|
||||
},
|
||||
customerAccount: {
|
||||
code: string,
|
||||
label: string,
|
||||
address: {
|
||||
address1: string,
|
||||
address2: string,
|
||||
address3: string,
|
||||
zipCode: string,
|
||||
city: string,
|
||||
country: string,
|
||||
state?: string | null
|
||||
}
|
||||
},
|
||||
offer: {
|
||||
code: string,
|
||||
description: string,
|
||||
},
|
||||
party: {
|
||||
name: string,
|
||||
code: string,
|
||||
contractReference: string,
|
||||
partyType: string,
|
||||
},
|
||||
lineCustomFields: {
|
||||
custom1: {
|
||||
label: string | null,
|
||||
value: string | null
|
||||
},
|
||||
custom2: {
|
||||
label: string | null,
|
||||
value: string | null
|
||||
},
|
||||
custom3: {
|
||||
label: string | null,
|
||||
value: string | null
|
||||
},
|
||||
custom4: {
|
||||
label: string | null,
|
||||
value: string | null
|
||||
},
|
||||
custom5: {
|
||||
label: string | null,
|
||||
value: string | null
|
||||
},
|
||||
custom6: {
|
||||
label: string | null,
|
||||
value: string | null
|
||||
}
|
||||
},
|
||||
status: {
|
||||
status: string,
|
||||
preactivationDate: string | null, //"2026-03-17",
|
||||
activationDate: string | null, //"2026-03-17T11:04:11.408+00:00",
|
||||
commercialStatus: string, //"test",
|
||||
commercialStatusDate: string, //"2026-03-17T11:41:01.493+00:00",
|
||||
networkStatus: string, // "ACTIVATED",
|
||||
billingStatus: "ACTIVATED" | "SUSPENDED" | "CANCELED" | "TEST",
|
||||
billingStatusChangeDate: string | null, // "2026-03-17T11:01:00.276+00:00",
|
||||
billingActivationDate: string | null //,
|
||||
createdDate: string | null,//"2026-01-30T01:50:02.060+00:00"
|
||||
},
|
||||
services: string | null
|
||||
};
|
||||
|
||||
export type ObjeniousLineDb = {
|
||||
id: number;
|
||||
simId?: number;
|
||||
iccid: string;
|
||||
msisdn?: string;
|
||||
imei?: string;
|
||||
imeiChangeDate?: Date;
|
||||
offerCode?: string;
|
||||
status?: string;
|
||||
preactivationDate?: Date | null;
|
||||
activationDate?: Date | null;
|
||||
commercialStatus?: string;
|
||||
commercialStatusDate?: Date | null;
|
||||
billingStatus?: string;
|
||||
billingStatusChangeDate?: Date | null;
|
||||
billingActivationDate?: Date | null;
|
||||
createDate?: Date | null;
|
||||
raw: ObjeniousLine;
|
||||
}
|
||||
|
||||
// DTO para inserción (omite el ID autogenerado)
|
||||
export type CreateObjeniousLineDTO = Omit<ObjeniousLineDb, 'id'>;
|
||||
|
||||
export function lineToCreateLineDto(line: ObjeniousLine): CreateObjeniousLineDTO {
|
||||
|
||||
const dateOrNull = (data: string | null) => {
|
||||
if (data == null) return null;
|
||||
return new Date(data)
|
||||
}
|
||||
|
||||
const transformed: CreateObjeniousLineDTO = {
|
||||
simId: line.identifier.simId,
|
||||
iccid: line.identifier.iccid,
|
||||
msisdn: line.identifier.msisdn,
|
||||
imei: line.identifier.imei,
|
||||
imeiChangeDate: new Date(line.device.imeiChangeDate),
|
||||
offerCode: line.offer.code,
|
||||
status: line.status.status,
|
||||
preactivationDate: dateOrNull(line.status.preactivationDate),
|
||||
activationDate: dateOrNull(line.status.activationDate),
|
||||
commercialStatus: line.status.commercialStatus,
|
||||
commercialStatusDate: dateOrNull(line.status.commercialStatusDate),
|
||||
billingStatus: line.status.billingStatus,
|
||||
billingStatusChangeDate: dateOrNull(line.status.activationDate),
|
||||
billingActivationDate: dateOrNull(line.status.activationDate),
|
||||
createDate: dateOrNull(line.status.activationDate),
|
||||
raw: line
|
||||
}
|
||||
|
||||
return transformed;
|
||||
}
|
||||
@@ -12,7 +12,7 @@ export type ObjeniousOperation = {
|
||||
id?: number;
|
||||
/** Uuid del mensaje asociado a la operacion */
|
||||
correlation_id?: string;
|
||||
operation: string;
|
||||
operation: "activate" | "suspend" | "terminate" | string; // TODO: completar y actualizar
|
||||
retry_count?: number;
|
||||
max_retry?: number;
|
||||
max_date_retry?: string | null;
|
||||
@@ -27,8 +27,7 @@ export type ObjeniousOperation = {
|
||||
}
|
||||
|
||||
export type ObjeniousOperationChange = {
|
||||
id?: number;
|
||||
operation_id: number;
|
||||
id?: number; operation_id: number;
|
||||
info?: string | null;
|
||||
error?: string | null;
|
||||
new_status: StatusEnum;
|
||||
@@ -46,10 +45,34 @@ export namespace Objenious {
|
||||
created: string,
|
||||
status: "NEW" | "RUNNING" | "OK" | "KO" | "REPLAYED" | "CANCELLED" | "CLOSED" | "DISABLED",
|
||||
statusDate: string,
|
||||
actionType: "PREACTIVATION_AND_ACTIVATION" | string, // todo: añadir el resto
|
||||
massActionIds: number[]
|
||||
actionType: ActionType
|
||||
massActionIds: number[],
|
||||
actionRequestReports:
|
||||
{
|
||||
requestId: string,
|
||||
actionRequestReportDataDTOs: [
|
||||
{
|
||||
data: string,
|
||||
newData: string | null,
|
||||
iccid: string,
|
||||
dataStatus: DataStatus
|
||||
}
|
||||
]
|
||||
}[],
|
||||
}
|
||||
|
||||
export type DataStatus = "DATA_INVALID_FORMAT" | "DATA_NOT_FOUND" | "DATA_NOT_ACTIVATED" | "SERVICE_DATA_NOT_ACTIVATED" |
|
||||
"DATA_WRONG_STATUS" | "DATA_NOT_AUTHORIZED" | "DATA_CUSTOMER_ACCOUNT_NOT_AUTHORIZED" | "DATA_AMBIGUOUS" |
|
||||
"NEW_DATA_INVALID_FORMAT" | "NEW_DATA_ALREADY_EXISTS" | "DUPLICATE_DATA" | "DATA_TERMINATION_VALIDATED" |
|
||||
"DATA_TERMINATION_SECURISED" | "MAX_ALARM_INSTANCE" | "MAX_ALARM_INSTANCE_TO_CATCH_UP" |
|
||||
"ACTIVATED_LINE_CANNOT_BE_TRANSFERED" | "ESIM_WRONG_STEP" | "ESIM_WRONG_PAIRED_VALUE" |
|
||||
"ESIM_WRONG_DOWNLOAD_STATE" | "ESIM_WRONG_STATUS" | "ESIM_WRONG_FAMILY" | "ESIM_WRONG_CATEGORY" |
|
||||
"ENTITY_STATUS_NOT_AUTHORIZED" | "LONG_LIFE_NOT_ALLOWED" | "RCARD_NOT_COMPATIBLE" | "APN_NOT_FOUND" |
|
||||
"APN_OR_DNN_NOT_FOUND" | "APN_CONFIGURATION_NOT_FOUND" | "APN_CONFIGURATION_INVALID_PARAMETER_FILE" |
|
||||
"IP_NOT_AVAILABLE" | "RADIUS_FIELD_LENGTH_NOT_ALLOWED" | "RADIUS_LOGIN_OR_PASSWORD_NOT_FOUND" | "RADIUS_PASSWORD_NOT_ALLOWED" |
|
||||
"RADIUS_LOGIN_NOT_ALLOWED" | "NETWORK_NOT_ACTIVATED" | "CHANGE_CUSTOMER_ACCOUNT_NOT_AllOWED" | "CHANGE_OFFER_NOT_ALLOWED" |
|
||||
"SIM_NOT_EUICC" | "OFFER_NOT_WSF_PALIER_FLOTTE_FR"
|
||||
|
||||
export type ActionType = "PREACTIVATION" | "PREACTIVATION_ACTIVATION" | "ACTIVATION" |
|
||||
"STATUS_CHANGE" | "ICCID_CHANGE" | "EUICC_NOTIFICATION"
|
||||
| "EUICC_AUDIT" | "MSISDN_CHANGE" | "ALARM_SETTING"
|
||||
|
||||
Reference in New Issue
Block a user