From 14842eb6dd7a376c38b5cacd3bbc136eda08329d Mon Sep 17 00:00:00 2001
From: zutto <zutto@localhost>
Date: Sun, 18 Aug 2024 09:02:15 +0300
Subject: [PATCH] fix opencollective tracking

---
 src/js/plugins/opencollective.js | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/js/plugins/opencollective.js b/src/js/plugins/opencollective.js
index 9e8155c..8eaa7ad 100644
--- a/src/js/plugins/opencollective.js
+++ b/src/js/plugins/opencollective.js
@@ -17,6 +17,16 @@ export class OpenCollective extends shield {
 		this.transactions().then((data) => {
 			try {
 				this.json = JSON.parse(data);
+				this.monthlyContributions(this.json.nodes).forEach((item) => {
+					console.log("item", item);
+					if (this.total[item.amount.currency] !== undefined) {
+						this.total[item.amount.currency] += (item.amount.value * -1);
+					} else {
+						this.total[item.amount.currency] = (item.amount.value * -1);
+					}
+
+				});
+				/*
 				this.json.nodes.forEach((item) => {
 					if (item.kind === "CONTRIBUTION" && item.order.frequency === "MONTHLY") {
 						if (this.total[item.amount.currency] !== undefined) {
@@ -26,7 +36,7 @@ export class OpenCollective extends shield {
 						}
 					}
 				});
-
+				*/
 				this.render(element);
 				this.loadingEnd(element);
 			} catch (e) {
@@ -37,6 +47,24 @@ export class OpenCollective extends shield {
 	})
     }
 
+
+    monthlyContributions(nodes) {
+	    let monthly = new Map();
+	    nodes.forEach(node => {
+		    //group items by node.order.createdAt
+		    if (node.kind === "CONTRIBUTION" && node.order.frequency === "MONTHLY" && node.order.status === "ACTIVE") {
+			    var id = `${node.oppositeAccount.id}${node.order.createdAt}`;
+			    if (!monthly.has(id)) {
+				    monthly.set(id, node);
+				    console.log("new", id);
+			    }
+		    }
+	    }
+	);
+	console.log("monthly", monthly);
+	return Array.from(monthly.values());
+    }
+
     async transactions() {
 	try { 
 		const fetch = new fetcher();