diff options
| author | priscilla <priscilla.huang@efrei.net> | 2022-12-08 09:46:30 -0500 |
|---|---|---|
| committer | priscilla <priscilla.huang@efrei.net> | 2022-12-08 09:48:14 -0500 |
| commit | c903b08437ccb6109491ed5e0a9bcb835ab034ef (patch) | |
| tree | 07e6bd59a03f81d5e14fd5424af28bcff366d25d /src | |
| parent | 705064978a7297965c55cc8582c1b40f69827bab (diff) | |
update
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-delete-templates-ID.c | 6 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-delete-webhooks-ID.c | 6 | ||||
| -rw-r--r-- | src/include/taler_merchant_service.h | 2 | ||||
| -rw-r--r-- | src/lib/merchant_api_patch_template.c | 2 | ||||
| -rw-r--r-- | src/testing/test_merchant_api.c | 6 |
5 files changed, 15 insertions, 7 deletions
diff --git a/src/backend/taler-merchant-httpd_private-delete-templates-ID.c b/src/backend/taler-merchant-httpd_private-delete-templates-ID.c index c9a04295..94667567 100644 --- a/src/backend/taler-merchant-httpd_private-delete-templates-ID.c +++ b/src/backend/taler-merchant-httpd_private-delete-templates-ID.c @@ -58,7 +58,11 @@ TMH_private_delete_templates_ID (const struct TMH_RequestHandler *rh, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE, "delete_template (soft)"); - + case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_NOT_FOUND, + TALER_EC_MERCHANT_GENERIC_TEMPLATE_UNKNOWN, + hc->infix); case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: return TALER_MHD_reply_static (connection, MHD_HTTP_NO_CONTENT, diff --git a/src/backend/taler-merchant-httpd_private-delete-webhooks-ID.c b/src/backend/taler-merchant-httpd_private-delete-webhooks-ID.c index 6a8db79c..adf34ad8 100644 --- a/src/backend/taler-merchant-httpd_private-delete-webhooks-ID.c +++ b/src/backend/taler-merchant-httpd_private-delete-webhooks-ID.c @@ -58,7 +58,11 @@ TMH_private_delete_webhooks_ID (const struct TMH_RequestHandler *rh, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE, "delete_webhook (soft)"); - + case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS: + return TALER_MHD_reply_with_error (connection, + MHD_HTTP_NOT_FOUND, + TALER_EC_MERCHANT_GENERIC_WEBHOOK_UNKNOWN, + hc->infix); case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT: return TALER_MHD_reply_static (connection, MHD_HTTP_NO_CONTENT, diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h index bca806ce..09292c18 100644 --- a/src/include/taler_merchant_service.h +++ b/src/include/taler_merchant_service.h @@ -4309,7 +4309,7 @@ TALER_MERCHANT_template_patch ( const char *template_id, const char *template_description, const char *image, - const json_t *template_contract, + json_t *template_contract, TALER_MERCHANT_TemplatePatchCallback cb, void *cb_cls); diff --git a/src/lib/merchant_api_patch_template.c b/src/lib/merchant_api_patch_template.c index 01256f24..da3af08b 100644 --- a/src/lib/merchant_api_patch_template.c +++ b/src/lib/merchant_api_patch_template.c @@ -162,7 +162,7 @@ TALER_MERCHANT_template_patch ( const char *template_id, const char *template_description, const char *image, - const json_t *template_contract, + json_t *template_contract, TALER_MERCHANT_TemplatePatchCallback cb, void *cb_cls) { diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c index 299e800c..f99fb7b8 100644 --- a/src/testing/test_merchant_api.c +++ b/src/testing/test_merchant_api.c @@ -1335,7 +1335,7 @@ run (void *cls, "data:image/jpeg;base64,RAWDATA", json_pack ("{s:s}", "summary", - "EUR:1"), + "EUR"), MHD_HTTP_NO_CONTENT), TALER_TESTING_cmd_merchant_get_template ("get-template-t2", merchant_url, @@ -1350,11 +1350,11 @@ run (void *cls, TALER_TESTING_cmd_merchant_patch_template ("patch-templates-t3-nx", merchant_url, "template-3", - "nx updated template", + "updated template", "data:image/jpeg;base64,RAWDATA", json_pack ("{s:s}", "summary", - "EUR:1"), + "EUR"), MHD_HTTP_NOT_FOUND), TALER_TESTING_cmd_merchant_delete_template ("get-templates-empty", merchant_url, |