fix #7936

5 files changed, 129 insertions, 2 deletions

diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
index 778379cf..64b9883e 100644
--- a/src/backenddb/Makefile.am
+++ b/src/backenddb/Makefile.am
@@ -76,7 +76,8 @@ libtaler_plugin_merchantdb_postgres_la_SOURCES = \
   pg_insert_login_token.h pg_insert_login_token.c \
   pg_delete_login_token.h pg_delete_login_token.c \
   pg_select_login_token.h pg_select_login_token.c \
-pg_lookup_reserves.h pg_lookup_reserves.c \
+  pg_select_account_by_uri.h pg_select_account_by_uri.c \
+  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 \
diff --git a/src/backenddb/pg_select_account.c b/src/backenddb/pg_select_account.c
index abf7e9a8..29fda632 100644
--- a/src/backenddb/pg_select_account.c
+++ b/src/backenddb/pg_select_account.c
@@ -1,6 +1,6 @@
 /*
    This file is part of TALER
-   Copyright (C) 2022 Taler Systems SA
+   Copyright (C) 2023 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
diff --git a/src/backenddb/pg_select_account_by_uri.c b/src/backenddb/pg_select_account_by_uri.c
new file mode 100644
index 00000000..a0fbffb3
--- /dev/null
+++ b/src/backenddb/pg_select_account_by_uri.c
@@ -0,0 +1,79 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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_select_account_by_uri.c
+ * @brief Implementation of the select_account_by_uri function for Postgres
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <taler/taler_error_codes.h>
+#include <taler/taler_dbevents.h>
+#include <taler/taler_pq_lib.h>
+#include "pg_select_account_by_uri.h"
+#include "pg_helper.h"
+
+
+enum GNUNET_DB_QueryStatus
+TMH_PG_select_account_by_uri (void *cls,
+                              const char *id,
+                              const char *payto_uri,
+                              struct TALER_MERCHANTDB_AccountDetails *ad)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_string (id),
+    GNUNET_PQ_query_param_string (payto_uri),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_ResultSpec rs[] = {
+    GNUNET_PQ_result_spec_auto_from_type ("salt",
+                                          &ad->salt),
+    GNUNET_PQ_result_spec_auto_from_type ("h_wire",
+                                          &ad->h_wire),
+    GNUNET_PQ_result_spec_allow_null (
+      GNUNET_PQ_result_spec_string ("credit_facade_url",
+                                    &ad->credit_facade_url),
+      NULL),
+    GNUNET_PQ_result_spec_allow_null (
+      TALER_PQ_result_spec_json ("credit_facade_credentials",
+                                 &ad->credit_facade_credentials),
+      NULL),
+    GNUNET_PQ_result_spec_bool ("active",
+                                &ad->active),
+    GNUNET_PQ_result_spec_end
+  };
+
+  ad->payto_uri = GNUNET_strdup (payto_uri);
+  check_connection (pg);
+  PREPARE (pg,
+           "select_account",
+           "SELECT"
+           " salt"
+           ",h_wire"
+           ",credit_facade_url"
+           ",credit_facade_credentials"
+           ",active"
+           " FROM merchant_accounts"
+           " WHERE merchant_serial="
+           "  (SELECT merchant_serial "
+           "    FROM merchant_instances"
+           "    WHERE merchant_id=$1) AND "
+           " payto_uri=$2;");
+  return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
+                                                   "select_account",
+                                                   params,
+                                                   rs);
+}
diff --git a/src/backenddb/pg_select_account_by_uri.h b/src/backenddb/pg_select_account_by_uri.h
new file mode 100644
index 00000000..718209be
--- /dev/null
+++ b/src/backenddb/pg_select_account_by_uri.h
@@ -0,0 +1,44 @@
+/*
+   This file is part of TALER
+   Copyright (C) 2023 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_select_account_by_uri.h
+ * @brief implementation of the select_account_by_uri function for Postgres
+ * @author Christian Grothoff
+ */
+#ifndef PG_SELECT_ACCOUNT_BY_URI_H
+#define PG_SELECT_ACCOUNT_BY_URI_H
+
+#include <taler/taler_util.h>
+#include <taler/taler_json_lib.h>
+#include "taler_merchantdb_plugin.h"
+
+
+/**
+ * Obtain information about an instance's accounts.
+ *
+ * @param cls closure
+ * @param id identifier of the instance
+ * @param payto_uri URI of the account
+ * @param[out] ad account details returned
+ * @return database result code
+ */
+enum GNUNET_DB_QueryStatus
+TMH_PG_select_account_by_uri (void *cls,
+                              const char *id,
+                              const char *payto_uri,
+                              struct TALER_MERCHANTDB_AccountDetails *ad);
+
+#endif
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index 51298334..3682e5c1 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -91,6 +91,7 @@
 #include "pg_insert_deposit.h"
 #include "pg_lookup_refunds.h"
 #include "pg_mark_contract_paid.h"
+#include "pg_select_account_by_uri.h"
 #include "pg_refund_coin.h"
 #include "pg_lookup_order_status.h"
 #include "pg_lookup_order_status_by_serial.h"
@@ -3693,6 +3694,8 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
     = &TMH_PG_delete_login_token;
   plugin->select_login_token
     = &TMH_PG_select_login_token;
+  plugin->select_account_by_uri
+    = &TMH_PG_select_account_by_uri;
   plugin->lookup_instance_auth
     = &TMH_PG_lookup_instance_auth;
   plugin->insert_instance