Handle reverse missing optional cases

Author: abnegate

src/Database/Database.php

@@ -4980,18 +4980,21 @@ public function createOrUpdateDocumentsWithIncrease(
             if ($old->isEmpty()) {
                 $createdAt = $document->getCreatedAt();
                 $document->setAttribute('$createdAt', empty($createdAt) || !$this->preserveDates ? $time : $createdAt);
-
-                // Force matching optional parameter sets
-                // Doesn't use decode as that intentionally skips null defaults to reduce payload size
-                foreach ($collectionAttributes as $attr) {
-                    if (!$attr->getAttribute('required') && !$document->isSet($attr['$id'])) {
-                        $document->setAttribute($attr['$id'], $attr['default'] ?? null);
-                    }
-                }
             } else {
                 $document['$createdAt'] = $old->getCreatedAt();
             }
 
+            // Force matching optional parameter sets
+            // Doesn't use decode as that intentionally skips null defaults to reduce payload size
+            foreach ($collectionAttributes as $attr) {
+                if (!$attr->getAttribute('required') && !\array_key_exists($attr['$id'], (array)$document)) {
+                    $document->setAttribute(
+                        $attr['$id'],
+                        $old->getAttribute($attr['$id'], ($attr['default'] ?? null))
+                    );
+                }
+            }
+
             if (!$updatesPermissions) {
                 $document->setAttribute('$permissions', $old->getPermissions());
             }

tests/e2e/Adapter/Scopes/DocumentTests.php

@@ -621,13 +621,15 @@ public function testUpsertDocumentsAttributeMismatch(): void
             'first' => 'second',
         ]);
 
+        // Ensure missing optionals on new document is allowed
         $docs = $database->createOrUpdateDocuments(__FUNCTION__, [
             $existingDocument->setAttribute('first', 'updated'),
             $newDocument,
         ]);
 
         $this->assertEquals(2, $docs);
         $this->assertEquals('updated', $existingDocument->getAttribute('first'));
+        $this->assertEquals('last', $existingDocument->getAttribute('last'));
         $this->assertEquals('second', $newDocument->getAttribute('first'));
         $this->assertEquals('', $newDocument->getAttribute('last'));
 
@@ -640,6 +642,36 @@ public function testUpsertDocumentsAttributeMismatch(): void
         } catch (Throwable $e) {
             $this->assertTrue($e instanceof StructureException, $e->getMessage());
         }
+
+        // Ensure missing optionals on existing document is allowed
+        $docs = $database->createOrUpdateDocuments(__FUNCTION__, [
+            $existingDocument
+                ->setAttribute('first', 'first')
+                ->removeAttribute('last'),
+            $newDocument
+                ->setAttribute('last', 'last')
+        ]);
+
+        $this->assertEquals(2, $docs);
+        $this->assertEquals('first', $existingDocument->getAttribute('first'));
+        $this->assertEquals('last', $existingDocument->getAttribute('last'));
+        $this->assertEquals('second', $newDocument->getAttribute('first'));
+        $this->assertEquals('last', $newDocument->getAttribute('last'));
+
+        // Ensure set null on existing document is allowed
+        $docs = $database->createOrUpdateDocuments(__FUNCTION__, [
+            $existingDocument
+                ->setAttribute('first', 'first')
+                ->setAttribute('last', null),
+            $newDocument
+                ->setAttribute('last', 'last')
+        ]);
+
+        $this->assertEquals(1, $docs);
+        $this->assertEquals('first', $existingDocument->getAttribute('first'));
+        $this->assertEquals(null, $existingDocument->getAttribute('last'));
+        $this->assertEquals('second', $newDocument->getAttribute('first'));
+        $this->assertEquals('last', $newDocument->getAttribute('last'));
     }
 
     public function testUpsertDocumentsNoop(): void