donau

commit b460ec7d8aefd76a26f954ddd3f5073e20ae6bef
parent 49a7b4175dc34ca6b54bace6ffb395b4527472d0
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
Date:   Fri, 31 May 2024 11:58:46 +0200

fix sql

Diffstat:
M
src/donau/donau-httpd_batch-submit.c
 | 
4
++--
M
src/donaudb/donau_do_insert_submitted_receipts.sql
 | 
18
+++++++++---------

2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/donau/donau-httpd_batch-submit.c b/src/donau/donau-httpd_batch-submit.c
@@ -151,8 +151,8 @@ DH_handler_submit_receipts_post (struct DH_RequestContext *rc,
     /* Check nonce unique*/
     for (size_t j = i + 1; j < num_dr; j++)
     {
-      if (irc.donation_receipts[i].nonce.value == irc.donation_receipts[j].nonce
-          .value)
+      if (irc.donation_receipts[i].nonce.value ==
+          irc.donation_receipts[j].nonce.value)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                     "Donation receipt nonce is not unique!\n");
diff --git a/src/donaudb/donau_do_insert_submitted_receipts.sql b/src/donaudb/donau_do_insert_submitted_receipts.sql
@@ -17,8 +17,8 @@ CREATE OR REPLACE FUNCTION do_insert_submitted_receipts(
   IN in_h_tax_number BYTEA,
   IN ina_h_donation_unit_pubs BYTEA[],
   IN ina_nonces BYTEA[],
-  IN ina_donau_sigs BYTEA[],
-  IN in_dontation_year INT8,
+  IN ina_donation_unit_sigs BYTEA[],
+  IN in_donation_year INT8,
   --
   OUT out_conflict BOOL[]
  )
@@ -28,31 +28,31 @@ DECLARE
   i INT4;
   ini_nonce BYTEA;
   ini_h_donation_unit_pub BYTEA;
-  ini_donau_sig BYTEA;
+  ini_donation_unit_sig BYTEA;
 BEGIN
 
-out_conflict=FALSE;
-
 -- Insert each donation receipt
 
 FOR i IN 1..array_length(ina_h_donation_unit_pubs,1)
 LOOP
   ini_nonce = ina_nonces[i];
   ini_h_donation_unit_pub = ina_h_donation_unit_pubs[i];
-  ini_donau_sig = ina_donau_sigs[i];
+  ini_donation_unit_sig = ina_donation_unit_sigs[i];
+
+  out_conflict[i] = TRUE;
 
   INSERT INTO receipts_submitted
     (h_tax_number
     ,nonce
     ,donation_unit_pub
-    ,donau_sig
+    ,donation_unit_sig
     ,donation_year
     )
     VALUES
     (in_h_tax_number
     ,ini_nonce
     ,ini_h_donation_unit_pub
-    ,ini_donau_sig
+    ,ini_donation_unit_sig
     ,in_donation_year
     )
     ON CONFLICT DO NOTHING;
@@ -61,7 +61,7 @@ LOOP
   THEN
     PERFORM FROM receipts_submitted
       WHERE h_tax_number=in_h_tax_number
-        AND donau_sig=ini_donau_sig; -- if signature matches, everything must match
+        AND donation_unit_sig=ini_donation_unit_sig; -- if signature matches, everything must match
     out_conflict[i] = NOT FOUND;
   END IF;
 END LOOP; -- end FOR all coins