Factor out account_kyc_get_status (shit job)

1 files changed, 2 insertions, 184 deletions

diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index e98eb94c..b1aa8d2c 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -46,6 +46,7 @@
 #include "pg_update_transfer_status.h"
 #include "pg_insert_instance.h"
 #include "pg_account_kyc_set_status.h"
+#include "pg_account_kyc_get_status.h"
 #include "pg_set_transfer_status_to_confirmed.h"
 
 
@@ -324,173 +325,6 @@ postgres_commit (void *cls)
 
 
 /**
- * Closure for kyc_status_cb().
- */
-struct KycStatusContext
-{
-  /**
-   * Function to call with results.
-   */
-  TALER_MERCHANTDB_KycCallback kyc_cb;
-
-  /**
-   * Closure for @e kyc_cb.
-   */
-  void *kyc_cb_cls;
-
-  /**
-   * Filter, NULL to not filter.
-   */
-  const struct TALER_MerchantWireHashP *h_wire;
-
-  /**
-   * Filter, NULL to not filter.
-   */
-  const char *exchange_url;
-
-  /**
-   * Number of results found.
-   */
-  unsigned int count;
-
-  /**
-   * Set to true on failure(s).
-   */
-  bool failure;
-};
-
-
-/**
- * Function to be called with the results of a SELECT statement
- * that has returned @a num_results results about accounts.
- *
- * @param[in,out] cls of type `struct KycStatusContext *`
- * @param result the postgres result
- * @param num_results the number of results in @a result
- */
-static void
-kyc_status_cb (void *cls,
-               PGresult *result,
-               unsigned int num_results)
-{
-  struct KycStatusContext *ksc = cls;
-
-  for (unsigned int i = 0; i < num_results; i++)
-  {
-    struct TALER_MerchantWireHashP h_wire;
-    uint64_t kyc_serial;
-    char *exchange_url;
-    char *payto_uri;
-    struct GNUNET_TIME_Timestamp last_check;
-    bool kyc_ok;
-    uint32_t aml_decision;
-    struct GNUNET_PQ_ResultSpec rs[] = {
-      GNUNET_PQ_result_spec_auto_from_type ("h_wire",
-                                            &h_wire),
-      GNUNET_PQ_result_spec_uint64 ("exchange_kyc_serial",
-                                    &kyc_serial),
-      GNUNET_PQ_result_spec_string ("payto_uri",
-                                    &payto_uri),
-      GNUNET_PQ_result_spec_string ("exchange_url",
-                                    &exchange_url),
-      GNUNET_PQ_result_spec_timestamp ("kyc_timestamp",
-                                       &last_check),
-      GNUNET_PQ_result_spec_bool ("kyc_ok",
-                                  &kyc_ok),
-      GNUNET_PQ_result_spec_uint32 ("aml_decision",
-                                    &aml_decision),
-      GNUNET_PQ_result_spec_end
-    };
-
-    if (GNUNET_OK !=
-        GNUNET_PQ_extract_result (result,
-                                  rs,
-                                  i))
-    {
-      GNUNET_break (0);
-      ksc->failure = true;
-      return;
-    }
-    if ( (NULL != ksc->exchange_url) &&
-         (0 != strcmp (ksc->exchange_url,
-                       exchange_url)) )
-    {
-      GNUNET_PQ_cleanup_result (rs);
-      continue;
-    }
-    if ( (NULL != ksc->h_wire) &&
-         (0 != GNUNET_memcmp (ksc->h_wire,
-                              &h_wire)) )
-    {
-      GNUNET_PQ_cleanup_result (rs);
-      continue;
-    }
-    ksc->count++;
-    ksc->kyc_cb (ksc->kyc_cb_cls,
-                 &h_wire,
-                 kyc_serial,
-                 payto_uri,
-                 exchange_url,
-                 last_check,
-                 kyc_ok,
-                 (enum TALER_AmlDecisionState) aml_decision);
-    GNUNET_PQ_cleanup_result (rs);
-  }
-}
-
-
-/**
- * Check 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,
- *        NULL to check all accounts of the merchant
- * @param exchange_url base URL of the exchange to check,
- *        NULL to check all exchanges
- * @param kyc_cb KYC status callback to invoke
- * @param kyc_cb_cls closure for @a kyc_cb
- * @return database result code
- */
-static enum GNUNET_DB_QueryStatus
-postgres_account_kyc_get_status (void *cls,
-                                 const char *merchant_id,
-                                 const struct TALER_MerchantWireHashP *h_wire,
-                                 const char *exchange_url,
-                                 TALER_MERCHANTDB_KycCallback kyc_cb,
-                                 void *kyc_cb_cls)
-{
-  struct PostgresClosure *pg = cls;
-  struct KycStatusContext ksc = {
-    .kyc_cb = kyc_cb,
-    .kyc_cb_cls = kyc_cb_cls,
-    .exchange_url = exchange_url,
-    .h_wire = h_wire
-  };
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_string (merchant_id),
-    GNUNET_PQ_query_param_end
-  };
-  enum GNUNET_DB_QueryStatus qs;
-
-  check_connection (pg);
-  qs = GNUNET_PQ_eval_prepared_multi_select (pg->conn,
-                                             "lookup_kyc_status",
-                                             params,
-                                             &kyc_status_cb,
-                                             &ksc);
-  if (ksc.failure)
-  {
-    GNUNET_break (0);
-    return GNUNET_DB_STATUS_HARD_ERROR;
-  }
-  if (0 > qs)
-    return qs;
-  return ksc.count;
-}
-
-
-/**
  * Delete private key of an instance from our database.
  *
  * @param cls closure
@@ -6878,22 +6712,6 @@ postgres_connect (void *cls)
   struct GNUNET_PQ_PreparedStatement ps[] = {
     GNUNET_PQ_make_prepare ("end_transaction",
                             "COMMIT"),
-    /* for postgres_account_kyc_get_status */
-    GNUNET_PQ_make_prepare ("lookup_kyc_status",
-                            "SELECT"
-                            " h_wire"
-                            ",exchange_kyc_serial"
-                            ",payto_uri"
-                            ",exchange_url"
-                            ",kyc_timestamp"
-                            ",kyc_ok"
-                            ",aml_decision"
-                            " FROM merchant_instances"
-                            " JOIN merchant_accounts"
-                            "   USING (merchant_serial)"
-                            " JOIN merchant_kyc"
-                            "   USING (account_serial)"
-                            " WHERE merchant_instances.merchant_id=$1"),
     /* for postgres_delete_instance_private_key() */
     GNUNET_PQ_make_prepare ("delete_key",
                             "DELETE FROM merchant_keys"
@@ -9255,7 +9073,7 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
   plugin->account_kyc_set_status
     = &TMH_PG_account_kyc_set_status;
   plugin->account_kyc_get_status
-    = &postgres_account_kyc_get_status;
+    = &TMH_PG_account_kyc_get_status;
   plugin->delete_instance_private_key = &postgres_delete_instance_private_key;
   plugin->purge_instance = &postgres_purge_instance;
   plugin->update_instance = &postgres_update_instance;