Factor out activate_account (shit job)

4 files changed, 98 insertions, 37 deletions

diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
index 76eb90f2..6227eba2 100644
--- a/src/backenddb/Makefile.am
+++ b/src/backenddb/Makefile.am
@@ -74,6 +74,7 @@ libtaler_plugin_merchantdb_postgres_la_SOURCES = \
   pg_update_instance.h pg_update_instance.c \
   pg_update_instance_auth.h pg_update_instance_auth.c \
   pg_inactivate_account.h pg_inactivate_account.c \
+  pg_activate_account.h pg_activate_account.c \
   plugin_merchantdb_postgres.c  pg_helper.h
 libtaler_plugin_merchantdb_postgres_la_LIBADD = \
   $(LTLIBINTL)
diff --git a/src/backenddb/pg_activate_account.c b/src/backenddb/pg_activate_account.c
new file mode 100644
index 00000000..21c23752
--- /dev/null
+++ b/src/backenddb/pg_activate_account.c
@@ -0,0 +1,53 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022 Taler Systems SA
+
+   TALER is free software; you can redistribute it and/or modify it under the
+   terms of the GNU General Public License as published by the Free Software
+   Foundation; either version 3, or (at your option) any later version.
+
+   TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+   A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along with
+   TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+ */
+/**
+ * @file backenddb/pg_activate_account.c
+ * @brief Implementation of the activate_account function for Postgres
+ * @author Iván Ávalos
+ */
+#include "platform.h"
+#include <taler/taler_error_codes.h>
+#include <taler/taler_dbevents.h>
+#include <taler/taler_pq_lib.h>
+#include "pg_activate_account.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TMH_PG_activate_account (void *cls,
+                         const char *merchant_id,
+                         const struct TALER_MerchantWireHashP *h_wire)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (merchant_id),
+    GNUNET_PQ_query_param_auto_from_type (h_wire),
+    GNUNET_PQ_query_param_end
+  };
+
+  check_connection (pg);
+  PREPARE (pg,
+           "activate_account",
+           "UPDATE merchant_accounts SET"
+           " active=TRUE"
+           " WHERE h_wire=$2 AND"
+           " merchant_serial="
+           "   (SELECT merchant_serial"
+           "      FROM merchant_instances"
+           "      WHERE merchant_id=$1)");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "activate_account",
+                                             params);
+}
diff --git a/src/backenddb/pg_activate_account.h b/src/backenddb/pg_activate_account.h
new file mode 100644
index 00000000..5edb7d1a
--- /dev/null
+++ b/src/backenddb/pg_activate_account.h
@@ -0,0 +1,41 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2022 Taler Systems SA
+
+   TALER is free software; you can redistribute it and/or modify it under the
+   terms of the GNU General Public License as published by the Free Software
+   Foundation; either version 3, or (at your option) any later version.
+
+   TALER is distributed in the hope that it will be useful, but WITHOUT ANY
+   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+   A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along with
+   TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+ */
+/**
+ * @file backenddb/pg_activate_account.h
+ * @brief implementation of the activate_account function for Postgres
+ * @author Iván Ávalos
+ */
+#ifndef PG_ACTIVATE_ACCOUNT_H
+#define PG_ACTIVATE_ACCOUNT_H
+
+#include <taler/taler_util.h>
+#include <taler/taler_json_lib.h>
+#include "taler_merchantdb_plugin.h"
+
+/**
+ * Set an instance's account in our database to "active".
+ *
+ * @param cls closure
+ * @param merchant_id merchant backend instance ID
+ * @param h_wire hash of the wire account to set to active
+ * @return database result code
+ */
+enum GNUNET_DB_QueryStatus
+TMH_PG_activate_account (void *cls,
+                         const char *merchant_id,
+                         const struct TALER_MerchantWireHashP *h_wire);
+
+#endif
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index b5f8debc..0e0e7abb 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -52,6 +52,7 @@
 #include "pg_update_instance.h"
 #include "pg_update_instance_auth.h"
 #include "pg_inactivate_account.h"
+#include "pg_activate_account.h"
 #include "pg_set_transfer_status_to_confirmed.h"
 
 
@@ -330,33 +331,6 @@ postgres_commit (void *cls)
 
 
 /**
- * Set an instance's account in our database to "active".
- *
- * @param cls closure
- * @param merchant_id merchant backend instance ID
- * @param h_wire hash of the wire account to set to active
- * @return database result code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_activate_account (void *cls,
-                           const char *merchant_id,
-                           const struct TALER_MerchantWireHashP *h_wire)
-{
-  struct PostgresClosure *pg = cls;
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (merchant_id),
-    GNUNET_PQ_query_param_auto_from_type (h_wire),
-    GNUNET_PQ_query_param_end
-  };
-
-  check_connection (pg);
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "activate_account",
-                                             params);
-}
-
-
-/**
  * Context used for postgres_lookup_products().
  */
 struct LookupProductsContext
@@ -6566,15 +6540,6 @@ postgres_connect (void *cls)
   struct GNUNET_PQ_PreparedStatement ps[] = {
     GNUNET_PQ_make_prepare ("end_transaction",
                             "COMMIT"),
-    /* for postgres_activate_account() */
-    GNUNET_PQ_make_prepare ("activate_account",
-                            "UPDATE merchant_accounts SET"
-                            " active=TRUE"
-                            " WHERE h_wire=$2 AND"
-                            " merchant_serial="
-                            "   (SELECT merchant_serial"
-                            "      FROM merchant_instances"
-                            "      WHERE merchant_id=$1)"),
     /* for postgres_lookup_products() */
     GNUNET_PQ_make_prepare ("lookup_products",
                             "SELECT"
@@ -8890,7 +8855,8 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
     = &TMH_PG_update_instance;
   plugin->update_instance_auth
     = &TMH_PG_update_instance_auth;
-  plugin->activate_account = &postgres_activate_account;
+  plugin->activate_account
+    = &TMH_PG_activate_account;
   plugin->inactivate_account
     = &TMH_PG_inactivate_account;
   plugin->update_transfer_status