refactor: Update form migrations

jonwaldstein · Jul 20, 2023 · d9735ae · d9735ae
1 parent 5cdf7f3
commit d9735ae
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/FormMigration/Commands/MigrationCommand.php b/src/FormMigration/Commands/MigrationCommand.php
@@ -27,9 +27,8 @@ public function __invoke( $args, $assoc_args )
     {
         [$formIdV2] = $args;
 
-        $payload = new FormMigrationPayload(
-            DonationFormV2::find($formIdV2),
-            DonationFormV3::factory()->make()
+        $payload = FormMigrationPayload::fromFormV2(
+            DonationFormV2::find($formIdV2)
         );
 
         $pipeline = give(Pipeline::class);
@@ -44,7 +43,6 @@ public function __invoke( $args, $assoc_args )
         $pipeline
             ->process($payload)
             ->finally(function($payload) {
-                $payload->formV3->save();
                 WP_CLI::success( 'Migration Complete ' . $payload->formV3->id );
             });
     }

diff --git a/src/FormMigration/Controllers/MigrationController.php b/src/FormMigration/Controllers/MigrationController.php
@@ -28,9 +28,8 @@ public function __construct(WP_REST_Request $request)
 
     public function __invoke($formIdV2)
     {
-        $payload = new FormMigrationPayload(
-            DonationFormV2::find($formIdV2),
-            DonationFormV3::factory()->make()
+        $payload = FormMigrationPayload::fromFormV2(
+            DonationFormV2::find($formIdV2)
         );
 
         give(Pipeline::class)
@@ -53,7 +52,6 @@ public function __invoke($formIdV2)
             })
             ->process($payload)
             ->finally(function($payload) {
-                $payload->formV3->save();
                 Log::info(esc_html__('Form migrated from v2 to v3.', 'give'), $this->debugContext);
             });
 

diff --git a/src/FormMigration/DataTransferObjects/FormMigrationPayload.php b/src/FormMigration/DataTransferObjects/FormMigrationPayload.php
@@ -18,4 +18,9 @@ public function __construct(DonationFormV2 $formV2, DonationFormV3 $formV3)
         $this->formV2 = $formV2;
         $this->formV3 = $formV3;
     }
+
+    public static function fromFormV2(DonationFormV2 $formV2)
+    {
+        return new static($formV2, DonationFormV3::factory()->create());
+    }
 }
diff --git a/src/FormMigration/Steps/MigrateMeta.php b/src/FormMigration/Steps/MigrateMeta.php
@@ -10,6 +10,6 @@ public function process()
     {
         $oldFormId = $this->formV2->id;
         $newFormId = $this->formV3->id;
-        update_post_meta($newFormId, 'migratedFormId', $oldFormId);
+        give_update_meta( $newFormId, 'migratedFormId', $oldFormId );
     }
 }