Merge pull request #43 from regulaforensics/develop

Updated dg reading

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.43",
+  "version": "0.0.44",
   "author": "Regula Forensics, Inc.",
   "name": "@regulaforensics/document-reader-recipes",
   "description": "Document Reader Recipes",
@@ -9,7 +9,7 @@
     "test": "jest"
   },
   "peerDependencies": {
-    "@regulaforensics/document-reader-typings": ">=0.0.20",
+    "@regulaforensics/document-reader-typings": ">=0.0.22",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "reflect-metadata": "^0.2.2",

src/recipes/rfid/rfid-data-groups-status/models/consts/data-group-read-status.const.ts

@@ -0,0 +1,24 @@
+import { eRfidErrorCodes } from '@regulaforensics/document-reader-typings'
+
+
+export enum eDataGroupReadStatus {
+  /**
+  * Group exists but not read
+  */
+  NOT_PERFORMED = eRfidErrorCodes.ERROR_NOT_PERFORMED,
+
+  /**
+  * Group not exists
+  */
+  NOT_AVAILABLE = eRfidErrorCodes.ERROR_NOT_AVAILABLE,
+
+  /**
+  * Read without errors
+  */
+  NO_ERROR = eRfidErrorCodes.ERROR_NO_ERROR,
+
+  /**
+  * Read with errors
+  */
+  FAILED = eRfidErrorCodes.ERROR_FAILED
+}

src/recipes/rfid/rfid-data-groups-status/models/consts/index.ts

@@ -1 +1 @@
-export * from './data-group.const'
+export * from './data-group-read-status.const'

src/recipes/rfid/rfid-data-groups-status/models/rfid-data-group-status.model.ts

@@ -1,32 +1,25 @@
 import { plainToClass } from 'class-transformer'
-import { IsDefined, IsEnum, IsIn, validateSync, ValidationError } from 'class-validator'
-import { eRfidErrorCodes } from '@regulaforensics/document-reader-typings'
+import { IsDefined, IsEnum, IsInt, validateSync, ValidationError } from 'class-validator'
 
 import { AllowPrimitives } from '@/types'
-import { eDataGroup } from './consts'
+import { eDataGroupReadStatus } from './consts'
 
 
-export type tRfidDataGroupStatus =
-  eRfidErrorCodes.ERROR_NOT_PERFORMED |
-  eRfidErrorCodes.ERROR_NOT_AVAILABLE |
-  eRfidErrorCodes.ERROR_NO_ERROR |
-  eRfidErrorCodes.ERROR_FAILED
-
 /**
 * Rfid data group status
 */
 export interface iRRfidDataGroupStatus {
   /**
   * Data group
-  * @type {eDataGroup}
+  * @type {number}
   */
-  group: eDataGroup
+  group: number
 
   /**
-  * Status
-  * @type {tRfidDataGroupStatus}
+  * Data group read status
+  * @type {eDataGroupReadStatus}
   */
-  status: tRfidDataGroupStatus
+  status: eDataGroupReadStatus
 }
 
 /**
@@ -35,24 +28,19 @@ export interface iRRfidDataGroupStatus {
 export class RRfidDataGroupStatus implements iRRfidDataGroupStatus {
   /**
   * Data group
-  * @type {eDataGroup}
+  * @type {number}
   */
   @IsDefined()
-  @IsEnum(eDataGroup)
-  group: eDataGroup
+  @IsInt()
+  group: number
 
   /**
   * Status
-  * @type {tRfidDataGroupStatus}
+  * @type {eDataGroupReadStatus}
   */
   @IsDefined()
-  @IsIn([
-    eRfidErrorCodes.ERROR_NOT_PERFORMED,
-    eRfidErrorCodes.ERROR_NOT_AVAILABLE,
-    eRfidErrorCodes.ERROR_NO_ERROR,
-    eRfidErrorCodes.ERROR_FAILED
-  ])
-  status: tRfidDataGroupStatus
+  @IsEnum(eDataGroupReadStatus)
+  status: eDataGroupReadStatus
 
   /**
   * Create instance of RRfidDataGroupStatus from plain object

src/recipes/rfid/rfid-data-groups-status/rfid-data-groups-status.recipe.test.ts

@@ -37,9 +37,8 @@ describe('getRfidDataGroupsStatus', () => {
     test('should return some results', () => {
       const result = getRfidDataGroupsStatus(docReaderResponse)
 
-      // const hasChecked = result.some((status) => status.status === eRfidErrorCodes.ERROR_NO_ERROR)
-
-      expect(result.length).toBeGreaterThan(0)
+      expect(result).not.toBeNull()
+      expect(result).not.toBeUndefined()
     })
   })
 })