Add update_extra_metadata call.

This can be used for an instant update of specific keys of the extra column, reducing the chance of overwriting other data in there.
mysociety · Nov 9, 2023 · c057e79 · c057e79
1 parent 365bd10
commit c057e79
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/perllib/FixMyStreet/Roles/Extra.pm b/perllib/FixMyStreet/Roles/Extra.pm
@@ -1,5 +1,6 @@
 package FixMyStreet::Roles::Extra;
 use Moo::Role;
+use JSON::MaybeXS;
 
 =head1 NAME
 
@@ -83,6 +84,31 @@ sub unset_extra_metadata {
     $self->extra($extra);
 };
 
+=head2 update_extra_metadata
+
+This calls set_extra_metadata, plus immediately updates the database with the
+new data (so update in the DBIx::Class sense, not like update_extra_field),
+using the PostgreSQL || operator, to not affect anything else in the column.
+If you are using this, you probably don't want to then call update and
+potentially overwrite other things in the extra column.
+
+=cut
+
+sub update_extra_metadata {
+    my ($self, %new) = @_;
+
+    $self->set_extra_metadata(%new);
+    my $db = $self->result_source->schema->storage;
+    my $table = $self->result_source->name;
+    $db->dbh_do(sub {
+        my ($storage, $dbh, $json, $id) = @_;
+        $dbh->do("UPDATE $table SET extra = extra || ? WHERE id=?", undef, $json, $id);
+    },
+        encode_json(\%new),
+        $self->id
+    );
+}
+
 =head2 get_extra_metadata
 
     my $metadata = $problem->get_extra_metadata;

diff --git a/perllib/FixMyStreet/Roles/SCP.pm b/perllib/FixMyStreet/Roles/SCP.pm
@@ -23,8 +23,7 @@ sub waste_cc_get_redirect_url {
     my $admin_fee = $p->get_extra_field_value('admin_fee');
 
     my $redirect_id = mySociety::AuthToken::random_token();
-    $p->set_extra_metadata('redirect_id', $redirect_id);
-    $p->update;
+    $p->update_extra_metadata(redirect_id => $redirect_id);
 
     my $fund_code = $payment->config->{scp_fund_code};
     my $customer_ref = $payment->config->{customer_ref};
@@ -93,10 +92,8 @@ sub waste_cc_get_redirect_url {
         if ( $result->{transactionState} eq 'IN_PROGRESS' &&
              $result->{invokeResult}->{status} eq 'SUCCESS' ) {
 
-             $p->set_extra_metadata('scpReference', $result->{scpReference});
-             $p->update;
+             $p->update_extra_metadata(scpReference => $result->{scpReference});
 
-             # need to save scpReference against request here
              my $redirect = $result->{invokeResult}->{redirectUrl};
              return $redirect;
          } else {