Merge pull request #113 from nginformatica/fix/importer-tests

fix: apis sst importer
nginformatica · Jul 22, 2024 · 6267150 · 6267150
2 parents eb2c309 + bb5c9c7
commit 6267150
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "quirons-broker",
-  "version": "0.0.1-alpha.128",
+  "version": "0.0.1-alpha.129",
   "description": "A small library to expose the broker types",
   "main": "index.ts",
   "typings": "index.d.ts",

diff --git a/src/ttalk/schemas/IpeDelivery.ts b/src/ttalk/schemas/IpeDelivery.ts
@@ -21,25 +21,12 @@ export const IpeDeliveryInfo = t.intersection([
         caExpirationDate: datetime,
         /** Quantidade Entregue */
         deliveryAmount: t.number,
-        /** Motivo */
-        reason: t.union([
-            t.literal(0),
-            t.literal(1),
-            t.literal(2),
-            t.literal(3),
-            t.literal(4),
-            t.literal(5),
-            t.literal(6),
-            t.literal(7),
-            t.literal(8),
-            t.literal(9),
-        ]),
-        /** Indica se é efetivo */
-        effective: t.boolean,
     }),
     t.partial({
+        /** Indica se é efetivo */
+        effective: t.boolean,
         /** Data de Devolução */
-        returnDate: datetime,
+        returnDate: t.union([datetime, t.null]),
         /** Quantidade Devolvida */
         amountReturned: t.number,
         /** Motivo da Devolução */
@@ -49,15 +36,29 @@ export const IpeDeliveryInfo = t.intersection([
             t.literal(2),
             t.literal(3),
             t.literal(4),
+            t.null
         ]),
         /** Observações */
         observation: t.string,
         /** Data de Assinatura */
         issueDate: datetime,
         /** Data da Última Manutenção */
-        lastMaintenanceDate: datetime,
+        lastMaintenanceDate: t.union([datetime, t.null]),
         /** Custo */
         cost: t.number,
+        /** Motivo */
+        reason: t.union([
+            t.literal(0),
+            t.literal(1),
+            t.literal(2),
+            t.literal(3),
+            t.literal(4),
+            t.literal(5),
+            t.literal(6),
+            t.literal(7),
+            t.literal(8),
+            t.literal(9),
+        ]),
     })
 ])
 export type IpeDeliveryInfo = t.TypeOf<typeof IpeDeliveryInfo>

diff --git a/src/ttalk/schemas/Risk.ts b/src/ttalk/schemas/Risk.ts
@@ -62,13 +62,17 @@ const Training = t.type({
     ])
 })
 
-const Periodicity = t.type({
-    description: t.string,
-    fromAge: t.number,
-    toAge: t.number,
-    periodicity: t.number,
-    postAdmission: t.number,
-})
+const Periodicity = t.intersection([
+    t.type({
+        fromAge: t.number,
+        toAge: t.number,
+        periodicity: t.number,
+        postAdmission: t.number,
+    }),
+    t.partial({
+        description: t.string,   
+    })
+])
 
 const Exam = t.intersection([
     t.type({
@@ -163,7 +167,7 @@ export const RiskInfo = t.intersection([
         /** Observações */
         observation: t.string,
         /**Data de eliminação do risco */
-        eliminationDate: datetime,
+        eliminationDate: t.union([datetime, t.null]),
     })
 ])
 export type RiskInfo = t.TypeOf<typeof RiskInfo>

diff --git a/src/ttalk/schemas/SickNote.ts b/src/ttalk/schemas/SickNote.ts
@@ -34,17 +34,17 @@ export const SickNoteInfo = t.intersection([
         /** Observações */
         observation: t.string,
         /** Descrição do Tipo de Afastamento */
-        typeOfAbsence: t.string,
+        typeOfAbsence: t.union([t.string, t.null]),
         /** Descrição do Tipo de Abono */
-        typeOfAllowance: t.string,
+        typeOfAllowance: t.union([t.string, t.null]),
         /** Data de Início do Afastamento */
-        absenceStartDate: datetime,
+        absenceStartDate: t.union([datetime, t.null]),
         /** Data de Termino do Afastamento */
-        absenceEndDate: datetime,
+        absenceEndDate: t.union([datetime, t.null]),
         /** Data de Início do Abono */
-        allowanceStartDate: datetime,
+        allowanceStartDate: t.union([datetime, t.null]),
         /** Data de Termino do Abono */
-        allowanceEndDate: datetime,
+        allowanceEndDate: t.union([datetime, t.null]),
         /** Data da Perícia */
         reviewDate: datetime,
         /** Data de Previsão de Termino do Benefício */

diff --git a/src/ttalk/schemas/Vaccine.ts b/src/ttalk/schemas/Vaccine.ts
@@ -2,16 +2,21 @@
 import * as t from 'io-ts'
 import { Paging } from '../apis/types/totvsApiTypesBase'
 
-const Info = t.type({
-    description: t.string,
-    gender: t.union([t.literal(0), t.literal(1), t.literal(2)]),
-    fromAge: t.number,
-    toAge: t.number,
-    reinforcement: t.union([t.literal(0), t.literal(1), t.literal(2)]),
-    reinforcementInterval: t.number,
-    secondDoseInterval: t.number,
-    thirdDoseInterval: t.number,
-})
+const Info = t.intersection([
+    t.type({
+        description: t.string,
+        gender: t.union([t.literal(0), t.literal(1), t.literal(2)]),
+        fromAge: t.number,
+        toAge: t.number,
+        reinforcement: t.union([t.literal(0), t.literal(1), t.literal(2)]),
+        reinforcementInterval: t.number,
+    }),
+    t.partial({
+        secondDoseInterval: t.number,
+        thirdDoseInterval: t.number,
+    })
+
+])
 
 export const VaccineInfo = t.intersection([
     t.type({
@@ -27,8 +32,6 @@ export const VaccineInfo = t.intersection([
         vaccine: Info,
         /** Data de Aplicação */
         date: t.string,
-        /** Status */
-        status: t.union([t.literal(0), t.literal(1), t.literal(2)]),
         /** Dose Atual */
         currentDose: t.union([t.literal(0), t.literal(1), t.literal(2), t.literal(3)]),
         /** Dose */
@@ -37,6 +40,8 @@ export const VaccineInfo = t.intersection([
     t.partial({
         /** Lote */
         batch: t.string,
+        /** Status */
+        status: t.union([t.literal(0), t.literal(1), t.literal(2), t.null]),
     })
 ])
 export type VaccineInfo = t.TypeOf<typeof VaccineInfo>