Improve filtering of vintages (#2152)

biwano · web-flow · commit 3ded69cb20f1 · 2024-01-25T11:24:52.000+01:00
* Improve filtering of vintages

* Filter balances at GQL query level

* Update API version

* Increase API version
diff --git a/carbonmark-api/package.json b/carbonmark-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@klimadao/carbonmark-api",
-  "version": "5.3.2",
+  "version": "5.3.3",
   "description": "An API for exploring Carbonmark project data, prices and activity.",
   "main": "app.ts",
   "scripts": {
diff --git a/carbonmark-api/src/.generated/types/digitalCarbon.types.ts b/carbonmark-api/src/.generated/types/digitalCarbon.types.ts
@@ -4385,7 +4385,9 @@ export const PoolFragmentFragmentDoc = gql`
 export const GetDigitalCarbonProjectsVintagesDocument = gql`
     query getDigitalCarbonProjectsVintages {
   carbonProjects(first: 1000) {
-    carbonCredits(where: {currentSupply_not: "0", isExAnte: false}) {
+    carbonCredits(
+      where: {currentSupply_not: "0", isExAnte: false, poolBalances_: {balance_gte: "0"}}
+    ) {
       vintage
     }
   }
diff --git a/carbonmark-api/src/graphql/digitalCarbon.gql b/carbonmark-api/src/graphql/digitalCarbon.gql
@@ -1,6 +1,12 @@
 query getDigitalCarbonProjectsVintages {
   carbonProjects(first: 1000) {
-    carbonCredits(where: { currentSupply_not: "0", isExAnte: false }) {
+    carbonCredits(
+      where: {
+        currentSupply_not: "0"
+        isExAnte: false
+        poolBalances_: { balance_gte: "0" }
+      }
+    ) {
       vintage
     }
   }
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@klimadao/carbonmark-api",`
`3`		`- "version": "5.3.2",`
	`3`	`+ "version": "5.3.3",`
`4`	`4`	`"description": "An API for exploring Carbonmark project data, prices and activity.",`
`5`	`5`	`"main": "app.ts",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
@@ -4385,7 +4385,9 @@ export const PoolFragmentFragmentDoc = gql`
`4385`	`4385`	export const GetDigitalCarbonProjectsVintagesDocument = gql`
`4386`	`4386`	`query getDigitalCarbonProjectsVintages {`
`4387`	`4387`	`carbonProjects(first: 1000) {`
`4388`		`- carbonCredits(where: {currentSupply_not: "0", isExAnte: false}) {`
	`4388`	`+ carbonCredits(`
	`4389`	`+ where: {currentSupply_not: "0", isExAnte: false, poolBalances_: {balance_gte: "0"}}`
	`4390`	`+ ) {`
`4389`	`4391`	`vintage`
`4390`	`4392`	`}`
`4391`	`4393`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,12 @@`
`1`	`1`	`query getDigitalCarbonProjectsVintages {`
`2`	`2`	`carbonProjects(first: 1000) {`
`3`		`- carbonCredits(where: { currentSupply_not: "0", isExAnte: false }) {`
	`3`	`+ carbonCredits(`
	`4`	`+ where: {`
	`5`	`+ currentSupply_not: "0"`
	`6`	`+ isExAnte: false`
	`7`	`+ poolBalances_: { balance_gte: "0" }`
	`8`	`+ }`
	`9`	`+ ) {`
`4`	`10`	`vintage`
`5`	`11`	`}`
`6`	`12`	`}`