fixed adding classification fails on required attributes if already e…

…xist (#335)
formkiq · Jan 25, 2025 · 2bdf4f7 · 2bdf4f7
1 parent 959e655
commit 2bdf4f7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/dynamodb-documents/config/checkstyle/checkstyle.xml b/dynamodb-documents/config/checkstyle/checkstyle.xml
@@ -202,7 +202,6 @@
       <property name="max" value="50"/>
       <property name="countEmpty" value="false"/>
     </module>
-    <module name="ParameterNumber"/>
     <module name="RedundantModifier"/>
     <module name="EqualsHashCode"/>
     <module name="EmptyStatement"/>

diff --git a/dynamodb-documents/src/main/java/com/formkiq/stacks/dynamodb/DocumentServiceImpl.java b/dynamodb-documents/src/main/java/com/formkiq/stacks/dynamodb/DocumentServiceImpl.java
@@ -285,11 +285,11 @@ private Collection<DocumentAttributeRecord> generateDocumentAttributesToSave(fin
 
     // Previous document attributes without the ones that are going to be removed, so we don't
     // generate composite keys for them
-    List<DocumentAttributeRecord> previousDocument = previousDocumentAttributeRecords.stream()
-        .filter(element -> !attributesToBeDeleted.contains(element)).toList();
+    List<DocumentAttributeRecord> previousDocumentAttributes = previousDocumentAttributeRecords
+        .stream().filter(element -> !attributesToBeDeleted.contains(element)).toList();
 
     Collection<DocumentAttributeRecord> allAttributes =
-        Objects.concat(newDocumentAttributeRecords, previousDocument);
+        Objects.concat(newDocumentAttributeRecords, previousDocumentAttributes);
 
     Set<String> attrkeys =
         allAttributes.stream().map(DocumentAttributeRecord::getKey).collect(Collectors.toSet());
@@ -316,7 +316,7 @@ private Collection<DocumentAttributeRecord> generateDocumentAttributesToSave(fin
 
     // validation
     validateDocumentAttributes(schemaAttributes, siteId, documentId, documentAttributes,
-        attributesToBeDeleted, validation, validationAccess);
+        attributesToBeDeleted, previousDocumentAttributes, validation, validationAccess);
 
     listBuilder.setCompositeKeysToBeDeleted(compositeKeysToBeDeleted);
 
@@ -2332,16 +2332,19 @@ private void validateDocumentAttributes(final String siteId, final String docume
   private void validateDocumentAttributes(final List<SchemaAttributes> schemaAttributes,
       final String siteId, final String documentId,
       final Collection<DocumentAttributeRecord> documentAttributes,
-      final Collection<DocumentAttributeRecord> toBeDeleted, final AttributeValidation validation,
-      final AttributeValidationAccess validationAccess) throws ValidationException {
+      final Collection<DocumentAttributeRecord> toBeDeleted,
+      final List<DocumentAttributeRecord> previousDocumentAttributes,
+      final AttributeValidation validation, final AttributeValidationAccess validationAccess)
+      throws ValidationException {
 
     Collection<ValidationError> errors = new ArrayList<>();
 
     validateDocumentAttributes(siteId, documentId, documentAttributes, validationAccess, errors);
 
     if (errors.isEmpty()) {
 
-      Collection<DocumentAttributeRecord> concat = Objects.concat(documentAttributes, toBeDeleted);
+      Collection<DocumentAttributeRecord> concat = Objects
+          .concat(Objects.concat(documentAttributes, toBeDeleted), previousDocumentAttributes);
       Map<String, AttributeRecord> attributeRecordMap =
           this.attributeValidator.getAttributeRecordMap(siteId, concat);