[taler-donau] branch master updated: added more params to charity post

[gnunet]

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

johannes-casaburi pushed a commit to branch master
in repository donau.

The following commit(s) were added to refs/heads/master by this push:
     new 91e4670  added more params to charity post
91e4670 is described below

commit 91e46703ec0ef481c15b1870201303996e6d783c
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
AuthorDate: Wed Jan 10 23:26:55 2024 +0100

    added more params to charity post
---
 contrib/gana                         |  2 +-
 src/donau/donau-httpd_post-charity.c | 31 +++++++++++++++++++++----------
 src/include/donaudb_plugin.h         |  6 +++++-
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index 40f6cf1..8368009 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 40f6cf1015231663064eda98aa1e403cddd7b970
+Subproject commit 836800945d80db9c0160a10a84edc1a086339187
diff --git a/src/donau/donau-httpd_post-charity.c 
b/src/donau/donau-httpd_post-charity.c
index e6c2160..3f55822 100644
--- a/src/donau/donau-httpd_post-charity.c
+++ b/src/donau/donau-httpd_post-charity.c
@@ -38,15 +38,12 @@
  */
 struct InsertCharityContext
 {
-  /**
-   * Charity name
-   */
+  const struct DONAU_CharityPublicKeyP *charity_pub;
   const char *charity_name;
-
-  /**
-   * Charity URL
-   */
   const char *charity_url;
+  struct TALER_Amount *max_per_year;
+  struct TALER_Amount *receipts_to_date;
+  uint64_t current_year;
 
 };
 
@@ -75,8 +72,12 @@ insert_charity (void *cls,
   enum GNUNET_DB_QueryStatus qs;
 
   qs = DH_plugin->insert_charity (DH_plugin->cls,
+                                  icc->charity_pub,
                                   icc->charity_name,
-                                  icc->charity_url);
+                                  icc->charity_url,
+                                  icc->max_per_year,
+                                  icc->receipts_to_date,
+                                  icc->current_year);
   if (qs <= 0)
   {
     if (GNUNET_DB_STATUS_SOFT_ERROR != qs)
@@ -103,10 +104,20 @@ DH_handler_charity_post (struct DH_RequestContext *rc,
   struct InsertCharityContext icc;
 
   struct GNUNET_JSON_Specification spec[] = {
-    GNUNET_JSON_spec_string ("charity_url",
-                             &icc.charity_url),
+    GNUNET_JSON_spec_fixed_auto ("charity_pub",
+                                 &icc.charity_pub),
     GNUNET_JSON_spec_string ("charity_name",
                              &icc.charity_name),
+    GNUNET_JSON_spec_string ("charity_url",
+                             &icc.charity_url),
+    TALER_JSON_spec_amount ("max_per_year",
+                            DH_currency,
+                            icc.max_per_year),
+    TALER_JSON_spec_amount ("receipts_to_date",
+                            DH_currency,
+                            icc.receipts_to_date),
+    GNUNET_JSON_spec_uint64 ("current_year",
+                             &icc.current_year),
     GNUNET_JSON_spec_end ()
   };
 
diff --git a/src/include/donaudb_plugin.h b/src/include/donaudb_plugin.h
index 35e3a9a..ac10f55 100644
--- a/src/include/donaudb_plugin.h
+++ b/src/include/donaudb_plugin.h
@@ -379,8 +379,12 @@ struct DONAUDB_Plugin
   enum GNUNET_DB_QueryStatus
     (*insert_charity)(
     void *cls,
+    const struct DONAU_CharityPublicKeyP *charity_pub,
     const char *charity_name,
-    const char *charity_url);
+    const char *charity_url,
+    struct TALER_Amount *max_per_year,
+    struct TALER_Amount *receipts_to_date,
+    uint64_t current_year);
 
 };
 

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