[taler-donau] branch master updated: fix pg_iterate_submitted_receipts

[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 c8c1a91  fix pg_iterate_submitted_receipts
c8c1a91 is described below

commit c8c1a91706fdafe6b40552fb6d7e1903e6749d0f
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
AuthorDate: Wed May 1 11:49:37 2024 +0200

    fix pg_iterate_submitted_receipts
---
 contrib/gana                                |  2 +-
 src/donau/donau-httpd_batch-submit.c        |  9 +--------
 src/donaudb/pg_iterate_submitted_receipts.c |  4 ++--
 src/donaudb/pg_iterate_submitted_receipts.h |  3 +--
 src/include/donaudb_plugin.h                | 10 ----------
 5 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index cc2d9bd..e6540cf 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit cc2d9bdb3e90af5ddebf964e3da492c04a307417
+Subproject commit e6540cf597091eabaa732826d5ad1185f4bcc5c1
diff --git a/src/donau/donau-httpd_batch-submit.c 
b/src/donau/donau-httpd_batch-submit.c
index 9107ac9..c26d985 100644
--- a/src/donau/donau-httpd_batch-submit.c
+++ b/src/donau/donau-httpd_batch-submit.c
@@ -197,14 +197,7 @@ DH_handler_submit_receipts_post (struct DH_RequestContext 
*rc,
                                        "donation_receipts");
   }
 
-  // FIXME
-  // Fetch donation receipts and join with donation units to get amount
-  // then create donation statement
-
-  // FIXME
-  // Send back DS
-
-  return MHD_HTTP_OK;
+  return MHD_HTTP_CREATED;
 }
 
 
diff --git a/src/donaudb/pg_iterate_submitted_receipts.c 
b/src/donaudb/pg_iterate_submitted_receipts.c
index 2d187aa..b5f0e71 100644
--- a/src/donaudb/pg_iterate_submitted_receipts.c
+++ b/src/donaudb/pg_iterate_submitted_receipts.c
@@ -71,7 +71,7 @@ DH_PG_iterate_submitted_receipts (
   fraction %= TALER_AMOUNT_FRAC_BASE;
   TALER_amount_set_zero (pg->currency,
                          total_donations);
-  total->donations->val = value;
-  total->donations->frac = fraction;
+  total_donations->value = value;
+  total_donations->fraction = fraction;
   return qs;
 }
diff --git a/src/donaudb/pg_iterate_submitted_receipts.h 
b/src/donaudb/pg_iterate_submitted_receipts.h
index 3da5b56..14644f8 100644
--- a/src/donaudb/pg_iterate_submitted_receipts.h
+++ b/src/donaudb/pg_iterate_submitted_receipts.h
@@ -38,7 +38,6 @@ DH_PG_iterate_submitted_receipts (
   void *cls,
   const uint64_t donation_year,
   const struct DONAU_HashDonorTaxId *h_donor_tax_id,
-  DONAUDB_IterateSubmittedReceiptsCallback cb,
-  void *cb_cls);
+  struct TALER_Amount *total_donations);
 
 #endif
diff --git a/src/include/donaudb_plugin.h b/src/include/donaudb_plugin.h
index 0221b84..f057113 100644
--- a/src/include/donaudb_plugin.h
+++ b/src/include/donaudb_plugin.h
@@ -149,16 +149,6 @@ typedef void
   const struct DONAU_DonauPublicKeyP *donau_pub,
   struct DONAUDB_SignkeyMetaData *meta);
 
-/**
- * Return value of submitted donation receipts.
- *
- * @param cls closure
- */
-typedef enum GNUNET_GenericReturnValue
-(*DONAUDB_IterateSubmittedReceiptsCallback)(
-  void *cls,
-  struct TALER_Amount *value);
-
 /**
  * Return donation units.
  *

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