[taler-merchant] 11/277: implement GET /instances/

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

commit e93a9431facf52909c79f61b978db339a8c9ac11
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Apr 18 17:59:57 2020 +0200

    implement GET /instances/
---
 src/backend/Makefile.am                            |   8 +-
 src/backend/taler-merchant-httpd.c                 |  32 +++++--
 src/backend/taler-merchant-httpd.h                 |   2 +-
 ...taler-merchant-httpd_private-get-instances-ID.c | 102 +++++++++++++++++++++
 ...taler-merchant-httpd_private-get-instances-ID.h |  41 +++++++++
 5 files changed, 175 insertions(+), 10 deletions(-)

diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index db8969d..025ac4c 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -23,8 +23,12 @@ taler_merchant_httpd_SOURCES = \
   taler-merchant-httpd_config.c taler-merchant-httpd_config.h \
   taler-merchant-httpd_exchanges.c taler-merchant-httpd_exchanges.h \
   taler-merchant-httpd_mhd.c taler-merchant-httpd_mhd.h \
-  taler-merchant-httpd_private-get-instances.c 
taler-merchant-httpd_private-get-instances.h \
-  taler-merchant-httpd_private-post-instances.c 
taler-merchant-httpd_private-post-instances.h
+  taler-merchant-httpd_private-get-instances.c \
+    taler-merchant-httpd_private-get-instances.h \
+  taler-merchant-httpd_private-get-instances-ID.c \
+    taler-merchant-httpd_private-get-instances-ID.h \
+  taler-merchant-httpd_private-post-instances.c \
+    taler-merchant-httpd_private-post-instances.h
 
 DEAD = \
   taler-merchant-httpd_check-payment.c taler-merchant-httpd_check-payment.h \
diff --git a/src/backend/taler-merchant-httpd.c 
b/src/backend/taler-merchant-httpd.c
index 7f5e32f..7f6d4dd 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -29,6 +29,7 @@
 #include "taler-merchant-httpd_exchanges.h"
 #include "taler-merchant-httpd_mhd.h"
 #include "taler-merchant-httpd_private-get-instances.h"
+#include "taler-merchant-httpd_private-get-instances-ID.h"
 #include "taler-merchant-httpd_private-post-instances.h"
 
 /**
@@ -728,6 +729,26 @@ url_handler (void *cls,
       .skip_instance = true,
       .handler = &TMH_private_get_instances
     },
+    /* GET /instances/$ID/: */
+    {
+      .url_prefix = "/",
+      .method = MHD_HTTP_METHOD_GET,
+      .handler = &TMH_private_get_instances_ID
+    },
+#if 0
+    /* DELETE /instances/$ID/: */
+    {
+      .url_prefix = "/",
+      .method = MHD_HTTP_METHOD_DELETE,
+      .handler = &TMH_private_delete_instances_ID
+    },
+    /* PATCH /instances/$ID/: */
+    {
+      .url_prefix = "/",
+      .method = MHD_HTTP_METHOD_PATCH,
+      .handler = &TMH_private_patch_instances_ID
+    },
+#endif
     {
       .url_prefix = "/instances",
       .method = MHD_HTTP_METHOD_POST,
@@ -983,13 +1004,10 @@ url_handler (void *cls,
   GNUNET_assert (NULL != hc->rh);
   if ( (NULL == hc->instance) &&
        (GNUNET_YES != hc->rh->skip_instance) )
-    return TALER_MHD_reply_json_pack (connection,
-                                      MHD_HTTP_NOT_FOUND,
-                                      "{s:I, s:s}",
-                                      "code",
-                                      (json_int_t) TALER_EC_INSTANCE_UNKNOWN,
-                                      "error",
-                                      "merchant instance unknown");
+    return TALER_MHD_reply_with_error (connection,
+                                       MHD_HTTP_NOT_FOUND,
+                                       TALER_EC_INSTANCE_UNKNOWN,
+                                       "merchant instance unknown");
   hc->has_body = ( (0 == strcasecmp (method,
                                      MHD_HTTP_METHOD_POST)) ||
                    (0 == strcasecmp (method,
diff --git a/src/backend/taler-merchant-httpd.h 
b/src/backend/taler-merchant-httpd.h
index 3a8b307..00d8df7 100644
--- a/src/backend/taler-merchant-httpd.h
+++ b/src/backend/taler-merchant-httpd.h
@@ -158,7 +158,7 @@ struct TMH_RequestHandler
   bool have_id_segment;
 
   /**
-   * Does this request handler expect an instance?
+   * Does this request handler work without an instance?
    */
   bool skip_instance;
 
diff --git a/src/backend/taler-merchant-httpd_private-get-instances-ID.c 
b/src/backend/taler-merchant-httpd_private-get-instances-ID.c
new file mode 100644
index 0000000..c379bfa
--- /dev/null
+++ b/src/backend/taler-merchant-httpd_private-get-instances-ID.c
@@ -0,0 +1,102 @@
+/*
+  This file is part of TALER
+  (C) 2019, 2020 Taler Systems SA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU Affero 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 backend/taler-merchant-httpd_private-get-instances-ID.c
+ * @brief implement GET /instances/$ID
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler-merchant-httpd_private-get-instances-ID.h"
+#include <taler/taler_json_lib.h>
+
+
+/**
+ * Handle a GET "/instances/$ID" request.
+ *
+ * @param rh context of the handler
+ * @param connection the MHD connection to handle
+ * @param[in,out] hc context with further information about the request
+ * @return MHD result code
+ */
+MHD_RESULT
+TMH_private_get_instances_ID (const struct TMH_RequestHandler *rh,
+                              struct MHD_Connection *connection,
+                              struct TMH_HandlerContext *hc)
+{
+  struct TMH_MerchantInstance *mi = hc->instance;
+  json_t *ja;
+
+  GNUNET_assert (NULL != mi);
+  ja = json_array ();
+  GNUNET_assert (NULL != ja);
+  for (struct TMH_WireMethod *wm = mi->wm_head;
+       NULL != wm;
+       wm = wm->next)
+  {
+    GNUNET_assert (
+      0 ==
+      json_array_append_new (
+        ja,
+        json_pack (
+          "{s:O, s:o, s:O, s:o}",
+          "payto_uri",
+          json_object_get (wm->j_wire,
+                           "payto_uri"),
+          "h_wire",
+          GNUNET_JSON_from_data_auto (&wm->h_wire),
+          "salt",
+          json_object_get (wm->j_wire,
+                           "salt"),
+          "active",
+          (wm->active) ? json_true () : json_false ())));
+  }
+
+  return TALER_MHD_reply_json_pack (
+    connection,
+    MHD_HTTP_OK,
+    "{s:o, s:s, s:o, s:O, s:O,"
+    " s:o, s:o, s:I, s:o, s:o}",
+    "accounts",
+    ja,
+    "name",
+    mi->settings.name,
+    "merchant_pub",
+    GNUNET_JSON_from_data_auto (
+      &mi->merchant_pub),
+    "address",
+    mi->settings.address,
+    "jurisdiction",
+    mi->settings.jurisdiction,
+    /* end of first group of 5 */
+    "default_max_wire_fee",
+    TALER_JSON_from_amount (
+      &mi->settings.default_max_wire_fee),
+    "default_max_deposit_fee",
+    TALER_JSON_from_amount (
+      &mi->settings.default_max_wire_fee),
+    "default_wire_fee_amortization",
+    (json_int_t)
+    &mi->settings.default_wire_fee_amortization,
+    "default_wire_transfer_delay",
+    GNUNET_JSON_from_time_rel (
+      mi->settings.default_wire_transfer_delay),
+    "default_pay_delay",
+    GNUNET_JSON_from_time_rel (
+      mi->settings.default_pay_delay));
+}
+
+
+/* end of taler-merchant-httpd_private-get-instances-ID.c */
diff --git a/src/backend/taler-merchant-httpd_private-get-instances-ID.h 
b/src/backend/taler-merchant-httpd_private-get-instances-ID.h
new file mode 100644
index 0000000..8532ad1
--- /dev/null
+++ b/src/backend/taler-merchant-httpd_private-get-instances-ID.h
@@ -0,0 +1,41 @@
+/*
+  This file is part of TALER
+  (C) 2019, 2020 Taler Systems SA
+
+  TALER is free software; you can redistribute it and/or modify it under the
+  terms of the GNU Affero 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 backend/taler-merchant-httpd_private-get-instances-ID.h
+ * @brief implement GET /instances/$ID/
+ * @author Christian Grothoff
+ */
+#ifndef TALER_MERCHANT_HTTPD_PRIVATE_GET_INSTANCES_ID_H
+#define TALER_MERCHANT_HTTPD_PRIVATE_GET_INSTANCES_ID_H
+
+#include "taler-merchant-httpd.h"
+
+
+/**
+ * Handle a GET "/instances/$ID" request.
+ *
+ * @param rh context of the handler
+ * @param connection the MHD connection to handle
+ * @param[in,out] hc context with further information about the request
+ * @return MHD result code
+ */
+MHD_RESULT
+TMH_private_get_instances_ID (const struct TMH_RequestHandler *rh,
+                              struct MHD_Connection *connection,
+                              struct TMH_HandlerContext *hc);
+
+/* end of taler-merchant-httpd_private-get-instances-ID.h */
+#endif

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.