merchant

commit ad2210f7eb4fa392c2140962fd1ff493034cae56
parent a0ecad773a8fa259f089c688ddf7db0e4faa63a4
Author: Bohdan Potuzhnyi <potub1@bfh.ch>
Date:   Tue,  8 Oct 2024 11:55:00 +0000

get /donau works

Diffstat:
M
src/backend/taler-merchant-httpd.c
 | 
7
+++++++
M
src/backenddb/Makefile.am
 | 
3
+--
M
src/backenddb/pg_select_donau_instance.c
 | 
5
++---
M
src/backenddb/plugin_merchantdb_postgres.c
 | 
6
++----

4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
@@ -99,6 +99,7 @@
 
 #ifdef HAVE_DONAU_DONAU_SERVICE_H
 #include "taler-merchant-httpd_private-get-donau-instances.h"
+//#include "taler-merchant-httpd_private-post-donau-instance.h"
 #endif
 
 /**
@@ -1347,6 +1348,12 @@ url_handler (void *cls,
       .method = MHD_HTTP_METHOD_GET,
       .handler = &TMH_private_get_donau_instances
     },
+    /* POST /donau */
+//    {
+//      .url_prefix = "/donau",
+//      .method = MHD_HTTP_METHOD_POST,
+//      .handler = &TMH_private_post_donau_instance
+//    }
     #endif
     {
       .url_prefix = NULL
diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
@@ -204,8 +204,7 @@ libtaler_plugin_merchantdb_postgres_la_SOURCES += \
   pg_upsert_donau_keys.h pg_upsert_donau_keys.c \
   pg_insert_donau_instance.h pg_insert_donau_instance.c \
   pg_select_donau_instance.h pg_select_donau_instance.c \
-  pg_delete_donau_instance.h pg_delete_donau_instance.c \
-  donau/donau_service.h 
+  pg_delete_donau_instance.h pg_delete_donau_instance.c
 endif
 
 libtaler_plugin_merchantdb_postgres_la_LIBADD = \
diff --git a/src/backenddb/pg_select_donau_instance.c b/src/backenddb/pg_select_donau_instance.c
@@ -27,7 +27,7 @@
 #include "pg_helper.h"
 
 enum GNUNET_DB_QueryStatus
-TMH_PG_select_donau_instances (void *cls,
+TMH_PG_select_donau_instance (void *cls,
                                struct TALER_MERCHANTDB_DonauInstance *di)
 {
   struct PostgresClosure *pg = cls;
@@ -62,8 +62,7 @@ TMH_PG_select_donau_instances (void *cls,
            ",dk.keys_json"
            " FROM merchant_donau_instances di"
            " JOIN merchant_donau_keys dk"
-           "   ON di.donau_url = dk.donau_url"
-           " WHERE di.donau_url=$1");
+           "   ON di.donau_url = dk.donau_url");
 
   return GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
                                                    "select_donau_instance",
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
@@ -635,8 +635,7 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
   plugin->lookup_spent_tokens_by_order
     = &TMH_PG_lookup_spent_tokens_by_order;
 
-  if(HAVE_DONAU_DONAU_SERVICE_H)
-  {
+  #ifdef HAVE_DONAU_DONAU_SERVICE_H
     plugin->insert_donau_instance
       = &TMH_PG_insert_donau_instance;
     plugin->select_donau_instance
@@ -647,8 +646,7 @@ libtaler_plugin_merchantdb_postgres_init (void *cls)
       = &TMH_PG_lookup_donau_keys;
     plugin->upsert_donau_keys
       = &TMH_PG_upsert_donau_keys;
-  }
-
+  #endif
 
   return plugin;
 }