openchs-models 1.22.1 → 1.22.2

package/dist/Individual.js

@@ -182,7 +182,7 @@ class Individual extends _BaseEntity.default {
 
     individual.gender = gender;
     individual.lowestAddressLevel = addressLevel;
-    individual.name = `${individual.firstName} ${individual.lastName}`;
+    individual.name = `${individual.firstName} ${individual.middleName ? individual.middleName : ''} ${individual.lastName}`;
     if (!_lodash.default.isNil(individualResource.registrationLocation)) individual.registrationLocation = _Point.default.fromResource(individualResource.registrationLocation);
     individual.subjectType = subjectType;
     return individual;
@@ -256,6 +256,11 @@ class Individual extends _BaseEntity.default {
     this.name = this.nameString;
   }
 
+  setMiddleName(middleName) {
+    this.middleName = middleName;
+    this.name = this.nameString;
+  }
+
   setLastName(lastName) {
     this.lastName = lastName;
     this.name = this.nameString;
@@ -287,7 +292,7 @@ class Individual extends _BaseEntity.default {
   }
 
   get nameString() {
-    return this.isPerson() ? `${this.firstName} ${this.lastName}` : this.firstName;
+    return this.isPerson() ? `${this.firstName} ${this.middleName ? this.middleName : ''} ${this.lastName}` : this.firstName;
   } //TODO: this will be fixed later where we specify the option to create a template to display another unique field along with the name
 
 
@@ -370,10 +375,10 @@ class Individual extends _BaseEntity.default {
     return validationResult;
   }
 
-  validateName(value, validationKey, validFormat) {
+  validateName(value, validationKey, validFormat, mandatory = true) {
     const failure = new _ValidationResult.default(false, validationKey);
 
-    if (_lodash.default.isEmpty(value)) {
+    if (_lodash.default.isEmpty(value) && mandatory) {
       failure.messageKey = "emptyValidationMessage";
     } else if (!_lodash.default.isEmpty(validFormat) && !validFormat.valid(value)) {
       failure.messageKey = validFormat.descriptionKey;
@@ -389,7 +394,7 @@ class Individual extends _BaseEntity.default {
   }
 
   validateMiddleName() {
-    return this.validateName(this.middleName, Individual.validationKeys.MIDDLE_NAME, this.subjectType.validMiddleNameFormat);
+    if (this.subjectType.allowMiddleName) return this.validateName(this.middleName, Individual.validationKeys.MIDDLE_NAME, this.subjectType.validMiddleNameFormat, false);
   }
 
   validateLastName() {
@@ -412,6 +417,7 @@ class Individual extends _BaseEntity.default {
     validationResults.push(this.validateFirstName());
 
     if (this.subjectType.isPerson()) {
+      validationResults.push(this.validateMiddleName());
       validationResults.push(this.validateLastName());
       validationResults.push(this.validateDateOfBirth());
       validationResults.push(this.validateGender());

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "openchs-models",
     "description": "OpenCHS data model to be used by front end clients",
-    "version": "1.22.1",
+    "version": "1.22.2",
     "private": false,
     "repository": {
         "type": "git",