Factor out account_kyc_set_status (shit job)

4 files changed, 146 insertions, 79 deletions

diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
index 6e66751f..5fda007a 100644
--- a/src/backenddb/Makefile.am
+++ b/src/backenddb/Makefile.am
@@ -67,6 +67,7 @@ libtaler_plugin_merchantdb_postgres_la_SOURCES = \
   pg_lookup_reserves.h pg_lookup_reserves.c \
   pg_lookup_instance_auth.h pg_lookup_instance_auth.c \
   pg_insert_instance.h pg_insert_instance.c \
+  pg_account_kyc_set_status.h pg_account_kyc_set_status.c \
   plugin_merchantdb_postgres.c  pg_helper.h
 libtaler_plugin_merchantdb_postgres_la_LIBADD = \
   $(LTLIBINTL)
diff --git a/src/backenddb/pg_account_kyc_set_status.c b/src/backenddb/pg_account_kyc_set_status.c
new file mode 100644
index 00000000..6c69c448
--- /dev/null
+++ b/src/backenddb/pg_account_kyc_set_status.c
@@ -0,0 +1,88 @@
+/*
+   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_account_kyc_set_status.c
+ * @brief Implementation of the account_kyc_set_status 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_account_kyc_set_status.h"
+#include "pg_helper.h"
+
+enum GNUNET_DB_QueryStatus
+TMH_PG_account_kyc_set_status (
+  void *cls,
+  const char *merchant_id,
+  const struct TALER_MerchantWireHashP *h_wire,
+  const char *exchange_url,
+  uint64_t exchange_kyc_serial,
+  const struct TALER_ExchangeSignatureP *exchange_sig,
+  const struct TALER_ExchangePublicKeyP *exchange_pub,
+  struct GNUNET_TIME_Timestamp timestamp,
+  bool kyc_ok,
+  enum TALER_AmlDecisionState aml_decision)
+{
+  struct PostgresClosure *pg = cls;
+  uint32_t aml32 = (uint32_t) aml_decision;
+  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_string (exchange_url),
+    GNUNET_PQ_query_param_uint64 (&exchange_kyc_serial),
+    GNUNET_PQ_query_param_timestamp (&timestamp),
+    GNUNET_PQ_query_param_bool (kyc_ok),
+    exchange_pub
+    ? GNUNET_PQ_query_param_auto_from_type (exchange_pub)
+    : GNUNET_PQ_query_param_null (),
+    exchange_sig
+    ? GNUNET_PQ_query_param_auto_from_type (exchange_sig)
+    : GNUNET_PQ_query_param_null (),
+    GNUNET_PQ_query_param_uint32 (&aml32),
+    GNUNET_PQ_query_param_end
+  };
+
+  check_connection (pg);
+  PREPARE (pg,
+           "upsert_account_kyc",
+           "INSERT INTO merchant_kyc"
+           "(kyc_timestamp"
+           ",kyc_ok"
+           ",exchange_kyc_serial"
+           ",account_serial"
+           ",exchange_url"
+           ",exchange_pub"
+           ",exchange_sig"
+           ",aml_decision)"
+           " SELECT $5, $6, $4, account_serial, $3, $7, $8, $9"
+           " FROM merchant_instances"
+           " JOIN merchant_accounts USING (merchant_serial)"
+           " WHERE merchant_id=$1"
+           "  AND h_wire=$2"
+           " ON CONFLICT(account_serial,exchange_url) DO "
+           "UPDATE"
+           " SET exchange_kyc_serial=$4"
+           "    ,kyc_timestamp=$5"
+           "    ,kyc_ok=$6"
+           "    ,exchange_pub=$7"
+           "    ,exchange_sig=$8"
+           "    ,aml_decision=$9");
+  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
+                                             "upsert_account_kyc",
+                                             params);
+}
diff --git a/src/backenddb/pg_account_kyc_set_status.h b/src/backenddb/pg_account_kyc_set_status.h
new file mode 100644
index 00000000..f8a8d96b
--- /dev/null
+++ b/src/backenddb/pg_account_kyc_set_status.h
@@ -0,0 +1,55 @@
+/*
+   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_account_kyc_set_status.h
+ * @brief implementation of the account_kyc_set_status function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_ACCOUNT_KYC_SET_STATUS_H
+#define PG_ACCOUNT_KYC_SET_STATUS_H
+
+#include <taler/taler_util.h>
+#include <taler/taler_json_lib.h>
+#include "taler_merchantdb_plugin.h"
+
+/**
+ * Update an instance's account's KYC status.
+ *
+ * @param cls closure
+ * @param merchant_id merchant backend instance ID
+ * @param h_wire hash of the wire account to check
+ * @param exchange_url base URL of the exchange to check
+ * @param exchange_kyc_serial serial number for our account at the exchange (0 if unknown)
+ * @param exchange_sig signature of the exchange, or NULL for none
+ * @param exchange_pub public key of the exchange, or NULL for none
+ * @param timestamp timestamp to store
+ * @param kyc_ok current KYC status (true for satisfied)
+ * @param aml_decision current AML decision state at the exchange
+ * @return database result code
+ */
+enum GNUNET_DB_QueryStatus
+TMH_PG_account_kyc_set_status (void *cls,
+                               const char *merchant_id,
+                               const struct TALER_MerchantWireHashP *h_wire,
+                               const char *exchange_url,
+                               uint64_t exchange_kyc_serial,
+                               const struct TALER_ExchangeSignatureP *exchange_sig,
+                               const struct TALER_ExchangePublicKeyP *exchange_pub,
+                               struct GNUNET_TIME_Timestamp timestamp,
+                               bool kyc_ok,
+                               enum TALER_AmlDecisionState aml_decision);
+
+#endif
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index 9605c29e..e98eb94c 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -45,6 +45,7 @@
 #include "pg_lookup_instance_auth.h"
 #include "pg_update_transfer_status.h"
 #include "pg_insert_instance.h"
+#include "pg_account_kyc_set_status.h"
 #include "pg_set_transfer_status_to_confirmed.h"
 
 
@@ -490,60 +491,6 @@ postgres_account_kyc_get_status (void *cls,
 
 
 /**
- * Update an instance's account's KYC status.
- *
- * @param cls closure
- * @param merchant_id merchant backend instance ID
- * @param h_wire hash of the wire account to check
- * @param exchange_url base URL of the exchange to check
- * @param exchange_kyc_serial serial number for our account at the exchange (0 if unknown)
- * @param exchange_sig signature of the exchange, or NULL for none
- * @param exchange_pub public key of the exchange, or NULL for none
- * @param timestamp timestamp to store
- * @param kyc_ok current KYC status (true for satisfied)
- * @param aml_decision current AML decision state at the exchange
- * @return database result code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_account_kyc_set_status (
-  void *cls,
-  const char *merchant_id,
-  const struct TALER_MerchantWireHashP *h_wire,
-  const char *exchange_url,
-  uint64_t exchange_kyc_serial,
-  const struct TALER_ExchangeSignatureP *exchange_sig,
-  const struct TALER_ExchangePublicKeyP *exchange_pub,
-  struct GNUNET_TIME_Timestamp timestamp,
-  bool kyc_ok,
-  enum TALER_AmlDecisionState aml_decision)
-{
-  struct PostgresClosure *pg = cls;
-  uint32_t aml32 = (uint32_t) aml_decision;
-  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_string (exchange_url),
-    GNUNET_PQ_query_param_uint64 (&exchange_kyc_serial),
-    GNUNET_PQ_query_param_timestamp (&timestamp),
-    GNUNET_PQ_query_param_bool (kyc_ok),
-    exchange_pub
-    ? GNUNET_PQ_query_param_auto_from_type (exchange_pub)
-    : GNUNET_PQ_query_param_null (),
-    exchange_sig
-    ? GNUNET_PQ_query_param_auto_from_type (exchange_sig)
-    : GNUNET_PQ_query_param_null (),
-    GNUNET_PQ_query_param_uint32 (&aml32),
-    GNUNET_PQ_query_param_end
-  };
-
-  check_connection (pg);
-  return GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "upsert_account_kyc",
-                                             params);
-}
-
-
-/**
  * Delete private key of an instance from our database.
  *
  * @param cls closure
@@ -6931,30 +6878,6 @@ postgres_connect (void *cls)
   struct GNUNET_PQ_PreparedStatement ps[] = {
     GNUNET_PQ_make_prepare ("end_transaction",
                             "COMMIT"),
-    /* for postgres_account_kyc_set_status */
-    GNUNET_PQ_make_prepare ("upsert_account_kyc",
-                            "INSERT INTO merchant_kyc"
-                            "(kyc_timestamp"
-                            ",kyc_ok"
-                            ",exchange_kyc_serial"
-                            ",account_serial"
-                            ",exchange_url"
-                            ",exchange_pub"
-                            ",exchange_sig"
-                            ",aml_decision)"
-                            " SELECT $5, $6, $4, account_serial, $3, $7, $8, $9"
-                            " FROM merchant_instances"
-                            " JOIN merchant_accounts USING (merchant_serial)"
-                            " WHERE merchant_id=$1"
-                            "  AND h_wire=$2"
-                            " ON CONFLICT(account_serial,exchange_url) DO "
-                            "UPDATE"
-                            " SET exchange_kyc_serial=$4"
-                            "    ,kyc_timestamp=$5"
-                            "    ,kyc_ok=$6"
-                            "    ,exchange_pub=$7"
-                            "    ,exchange_sig=$8"
-                            "    ,aml_decision=$9"),
     /* for postgres_account_kyc_get_status */
     GNUNET_PQ_make_prepare ("lookup_kyc_status",
                             "SELECT"
@@ -9330,7 +9253,7 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
   plugin->update_account
     = &TMH_PG_update_account;
   plugin->account_kyc_set_status
-    = &postgres_account_kyc_set_status;
+    = &TMH_PG_account_kyc_set_status;
   plugin->account_kyc_get_status
     = &postgres_account_kyc_get_status;
   plugin->delete_instance_private_key = &postgres_delete_instance_private_key;