Merge pull request #76 from regulaforensics/stable

Extended AuthenticityFibersCheck

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.74",
+  "version": "0.0.75",
   "author": "Regula Forensics, Inc.",
   "name": "@regulaforensics/document-reader-recipes",
   "description": "Document Reader Recipes",

src/recipes/authenticity/get-authenticity-check-list/get-authenticity-check-list.recipe.ts

@@ -61,6 +61,9 @@ export const getAuthenticityCheckList = (input: ProcessResponse): RAuthenticityC
           }
 
           current.groups[groupIndex].checks.push(RAuthenticityFibersCheck.fromPlain({
+            colorValues: subItem.ColorValues,
+            rectCount: subItem.RectCount,
+            expectedCount: subItem.ExpectedCount,
             checkType: subItem.Type,
             location: {
               light: undefined,

src/recipes/authenticity/get-authenticity-check-list/models/authenticity-check-groups-item/children/authenticity-check-group/children/authenticity-check/members/authenticity-fibers-check.model.ts

@@ -1,4 +1,4 @@
-import { IsDefined, IsEnum, IsIn, IsOptional, ValidateNested } from 'class-validator'
+import { IsDefined, IsEnum, IsIn, IsInt, IsOptional, ValidateNested } from 'class-validator'
 import {
   AuthenticityFibersTypeCheckResultTypes,
   eCheckDiagnose,
@@ -7,6 +7,7 @@ import {
 } from '@regulaforensics/document-reader-typings'
 import { plainToInstance, Type } from 'class-transformer'
 
+import { Default } from '@/decorators'
 import { aAuthenticityCheck } from '../authenticity-check.abstract'
 import { iRLocation, RLocation } from './children'
 
@@ -35,6 +36,24 @@ export interface iRAuthenticityFibersCheck extends aAuthenticityCheck {
   * @type {eCheckResult}
   */
   checkResult: eCheckResult
+
+  /**
+  * Fibers’ color (B, G, R)
+  * @type {number[]}
+  */
+  colorValues: number[]
+
+  /**
+  * Number of RectArray, Width, Length, Area items
+  * @type {number}
+  */
+  rectCount: number
+
+  /**
+  * Expected fibers number
+  * @type {number}
+  */
+  expectedCount: number
 }
 
 export class RAuthenticityFibersCheck extends aAuthenticityCheck implements iRAuthenticityFibersCheck {
@@ -71,6 +90,33 @@ export class RAuthenticityFibersCheck extends aAuthenticityCheck implements iRAu
   @IsEnum(eCheckResult)
   checkResult: eCheckResult
 
+  /**
+  * Fibers’ color (B, G, R)
+  * @type {number[]}
+  */
+  @IsDefined()
+  @Default([0,0,0])
+  @IsInt({ each: true })
+  colorValues: number[]
+
+  /**
+  * Number of RectArray, Width, Length, Area items
+  * @type {number}
+  */
+  @IsDefined()
+  @Default(0)
+  @IsInt()
+  rectCount: number
+
+  /**
+  * Expected fibers number
+  * @type {number}
+  */
+  @IsDefined()
+  @Default(0)
+  @IsInt()
+  expectedCount: number
+
   /**
   * Create instance of RAuthenticityImageCheckListItem from plain object
   * @param {iRAuthenticityFibersCheck} input - plain object