[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] 38/277: add PATCH /instances/ID command
From: |
gnunet |
Subject: |
[taler-merchant] 38/277: add PATCH /instances/ID command |
Date: |
Sun, 05 Jul 2020 20:49:11 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
commit a92f8f2653f734ef175e55eb6a95026248d66dd4
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Apr 22 22:47:55 2020 +0200
add PATCH /instances/ID command
---
src/testing/Makefile.am | 1 +
src/testing/testing_api_cmd_patch_instance.c | 276 +++++++++++++++++++++++++++
2 files changed, 277 insertions(+)
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index e2df524..c09c3a8 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -19,6 +19,7 @@ libtalermerchanttesting_la_SOURCES = \
testing_api_cmd_get_instances.c \
testing_api_cmd_delete_instance.c \
testing_api_cmd_post_instances.c \
+ testing_api_cmd_patch_instance.c \
\
testing_api_cmd_check_payment.c \
testing_api_cmd_history.c \
diff --git a/src/testing/testing_api_cmd_patch_instance.c
b/src/testing/testing_api_cmd_patch_instance.c
new file mode 100644
index 0000000..f5442c7
--- /dev/null
+++ b/src/testing/testing_api_cmd_patch_instance.c
@@ -0,0 +1,276 @@
+/*
+ This file is part of TALER
+ Copyright (C) 2020 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 lib/testing_api_cmd_patch_instance.c
+ * @brief command to test PATCH /instance
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include <taler/taler_exchange_service.h>
+#include <taler/taler_testing_lib.h>
+#include "taler_merchant_service.h"
+#include "taler_merchant_testing_lib.h"
+
+
+/**
+ * State of a "PATCH /instance" CMD.
+ */
+struct PatchInstanceState
+{
+
+ /**
+ * Handle for a "GET instance" request.
+ */
+ struct TALER_MERCHANT_InstancePatchHandle *iph;
+
+ /**
+ * The interpreter state.
+ */
+ struct TALER_TESTING_Interpreter *is;
+
+ /**
+ * Base URL of the merchant serving the request.
+ */
+ const char *merchant_url;
+
+ /**
+ * ID of the instance to run GET for.
+ */
+ const char *instance_id;
+
+ /**
+ * Length of the @payto_uris array
+ */
+ unsigned int payto_uris_length;
+
+ /**
+ * Array of payto URIs.
+ */
+ const char **payto_uris;
+
+ /**
+ * Name of the instance.
+ */
+ const char *name;
+
+ /**
+ * Address to use.
+ */
+ json_t *address;
+
+ /**
+ * Jurisdiction to use.
+ */
+ json_t *jurisdiction;
+
+ /**
+ * Wire fee to use.
+ */
+ struct TALER_Amount default_max_wire_fee;
+
+ /**
+ * Amortization to use.
+ */
+ uint32_t default_wire_fee_amortization;
+
+ /**
+ * Deposit fee ceiling to use.
+ */
+ struct TALER_Amount default_max_deposit_fee;
+
+ /**
+ * Wire transfer delay to use.
+ */
+ struct GNUNET_TIME_Relative default_wire_transfer_delay;
+
+ /**
+ * Order validity default duration to use.
+ */
+ struct GNUNET_TIME_Relative default_pay_delay;
+
+ /**
+ * Expected HTTP response code.
+ */
+ unsigned int http_status;
+
+};
+
+
+/**
+ * Callback for a PATCH /instance operation.
+ *
+ * @param cls closure for this function
+ */
+static void
+patch_instance_cb (void *cls,
+ const struct TALER_MERCHANT_HttpResponse *hr)
+{
+ struct PatchInstanceState *pis = cls;
+
+ pis->iph = NULL;
+ if (pis->http_status != hr->http_status)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unexpected response code %u (%d) to command %s\n",
+ hr->http_status,
+ (int) hr->ec,
+ TALER_TESTING_interpreter_get_current_label (pis->is));
+ TALER_TESTING_interpreter_fail (pis->is);
+ return;
+ }
+ switch (hr->http_status)
+ {
+ case MHD_HTTP_OK:
+ break;
+ // FIXME: add other legitimate states here...
+ default:
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Unhandled HTTP status.\n");
+ }
+ TALER_TESTING_interpreter_next (pis->is);
+}
+
+
+/**
+ * Run the "PATCH /instance" CMD.
+ *
+ *
+ * @param cls closure.
+ * @param cmd command being run now.
+ * @param is interpreter state.
+ */
+static void
+patch_instance_run (void *cls,
+ const struct TALER_TESTING_Command *cmd,
+ struct TALER_TESTING_Interpreter *is)
+{
+ struct PatchInstanceState *pis = cls;
+
+ pis->is = is;
+ pis->iph = TALER_MERCHANT_instance_patch (is->ctx,
+ pis->merchant_url,
+ pis->instance_id,
+ pis->payto_uris_length,
+ pis->payto_uris,
+ pis->name,
+ pis->address,
+ pis->jurisdiction,
+ &pis->default_max_wire_fee,
+ pis->default_wire_fee_amortization,
+ &pis->default_max_deposit_fee,
+ pis->default_wire_transfer_delay,
+ pis->default_pay_delay,
+ &patch_instance_cb,
+ pis);
+ GNUNET_assert (NULL != pis->iph);
+}
+
+
+/**
+ * Free the state of a "GET instance" CMD, and possibly
+ * cancel a pending operation thereof.
+ *
+ * @param cls closure.
+ * @param cmd command being run.
+ */
+static void
+patch_instance_cleanup (void *cls,
+ const struct TALER_TESTING_Command *cmd)
+{
+ struct PatchInstanceState *pis = cls;
+
+ if (NULL != pis->iph)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "GET /instance/$ID operation did not complete\n");
+ TALER_MERCHANT_instance_patch_cancel (pis->iph);
+ }
+ json_decref (pis->address);
+ json_decref (pis->jurisdiction);
+ GNUNET_free (pis);
+}
+
+
+/**
+ * Define a "PATCH /instance" CMD.
+ *
+ * @param label command label.
+ * @param merchant_url base URL of the merchant serving the
+ * PATCH /instance request.
+ * @param instance_id the ID of the instance to query
+ * @param payto_uris_length length of the @a accounts array
+ * @param payto_uris URIs of the bank accounts of the merchant instance
+ * @param name name of the merchant instance
+ * @param address physical address of the merchant instance
+ * @param jurisdiction jurisdiction of the merchant instance
+ * @param default_max_wire_fee default maximum wire fee merchant is willing to
fully pay
+ * @param default_wire_fee_amortization default amortization factor for excess
wire fees
+ * @param default_max_deposit_fee default maximum deposit fee merchant is
willing to pay
+ * @param default_wire_transfer_delay default wire transfer delay merchant
will ask for
+ * @param default_pay_delay default validity period for offers merchant makes
+ * @param http_status expected HTTP response code.
+ * @return the command.
+ */
+struct TALER_TESTING_Command
+TALER_TESTING_cmd_merchant_patch_instance (
+ const char *label,
+ const char *merchant_url,
+ const char *instance_id,
+ unsigned int payto_uris_length,
+ const char *payto_uris[],
+ const char *name,
+ json_t *address,
+ json_t *jurisdiction,
+ const struct TALER_Amount *default_max_wire_fee,
+ uint32_t default_wire_fee_amortization,
+ const struct TALER_Amount *default_max_deposit_fee,
+ struct GNUNET_TIME_Relative default_wire_transfer_delay,
+ struct GNUNET_TIME_Relative default_pay_delay,
+ unsigned int http_status)
+{
+ struct PatchInstanceState *pis;
+
+ pis = GNUNET_new (struct PatchInstanceState);
+ pis->merchant_url = merchant_url;
+ pis->instance_id = instance_id;
+ pis->http_status = http_status;
+ pis->payto_uris_length = payto_uris_length;
+ pis->payto_uris = payto_uris;
+ pis->name = name;
+ pis->address = address; /* ownership transfer! */
+ pis->jurisdiction = jurisdiction; /* ownership transfer! */
+ pis->default_max_wire_fee = *default_max_wire_fee;
+ pis->default_wire_fee_amortization = default_wire_fee_amortization;
+ pis->default_max_deposit_fee = *default_max_deposit_fee;
+ pis->default_wire_transfer_delay = default_wire_transfer_delay;
+ pis->default_pay_delay = default_pay_delay;
+ {
+ struct TALER_TESTING_Command cmd = {
+ .cls = pis,
+ .label = label,
+ .run = &patch_instance_run,
+ .cleanup = &patch_instance_cleanup
+ };
+
+ return cmd;
+ }
+}
+
+
+/* end of testing_api_cmd_patch_instance.c */
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant] 39/277: add PATCH /instances/ID command, (continued)
- [taler-merchant] 39/277: add PATCH /instances/ID command, gnunet, 2020/07/05
- [taler-merchant] 45/277: baseURL construction helper function', gnunet, 2020/07/05
- [taler-merchant] 44/277: fix ftbfs in lock logic, gnunet, 2020/07/05
- [taler-merchant] 41/277: add DELETE/PURGE /instances/ID command, gnunet, 2020/07/05
- [taler-merchant] 42/277: implement purge, gnunet, 2020/07/05
- [taler-merchant] 43/277: toward stesting, gnunet, 2020/07/05
- [taler-merchant] 50/277: misc fixes, gnunet, 2020/07/05
- [taler-merchant] 49/277: fix fmt string, gnunet, 2020/07/05
- [taler-merchant] 68/277: sql-ing, gnunet, 2020/07/05
- [taler-merchant] 53/277: implemente DELETE /orders/ID, gnunet, 2020/07/05
- [taler-merchant] 38/277: add PATCH /instances/ID command,
gnunet <=
- [taler-merchant] 46/277: improve API, gnunet, 2020/07/05
- [taler-merchant] 54/277: first hack at POST /orders, gnunet, 2020/07/05
- [taler-merchant] 57/277: implement logic to complete POSTed /orders using inventory data, gnunet, 2020/07/05
- [taler-merchant] 62/277: mark as obsolete, gnunet, 2020/07/05
- [taler-merchant] 60/277: GET /orders logic, gnunet, 2020/07/05
- [taler-merchant] 48/277: fix tests, gnunet, 2020/07/05
- [taler-merchant] 56/277: implement POST /orders client with all optional arguments, gnunet, 2020/07/05
- [taler-merchant] 55/277: fix fTBFS, gnunet, 2020/07/05
- [taler-merchant] 61/277: rename fest to match new structure, gnunet, 2020/07/05
- [taler-merchant] 69/277: update pay logic, gnunet, 2020/07/05