Add filtering to entitlement entities OM-778 OM-736 OM-732 (#1257)

* feat: add new fields to API * fix(api): rename filterMeter to filterMeterSlug for clarity * feat: add filtering to all entities * fix(api): fix casing mismatch in API ordering * style: fix lint
openmeterio · Jul 26, 2024 · d0ae77e · d0ae77e
1 parent 2069507
commit d0ae77e
Show file tree

Hide file tree

Showing 20 changed files with 1,513 additions and 592 deletions.
diff --git a/api/api.gen.go b/api/api.gen.go
diff --git a/api/client/go/client.gen.go b/api/client/go/client.gen.go
diff --git a/api/client/node/schemas/openapi.ts b/api/client/node/schemas/openapi.ts
@@ -1763,6 +1763,18 @@ export interface components {
      * Usage: `?feature=feature-1&feature=feature-2`
      */
     queryFilterFeature?: string[]
+    /**
+     * @description Filtering by multiple meterSlug.
+     *
+     * Usage: `?meterSlug=meter-1&meterSlug=meter-2`
+     */
+    queryFilterMeterSlug?: string[]
+    /**
+     * @description Filtering by multiple entitlement types.
+     *
+     * Usage: `?entitlementType=metered&entitlementType=static`
+     */
+    queryFilterEntitlementType?: string[]
     queryFilterGroupBy?: {
       [key: string]: string
     }
@@ -2210,6 +2222,10 @@ export interface operations {
         pageSize?: components['parameters']['queryPageSize']
         limit?: components['parameters']['queryLimit']
         offset?: components['parameters']['queryOffset']
+        subject?: components['parameters']['queryFilterSubject']
+        feature?: components['parameters']['queryFilterFeature']
+        entitlementType?: components['parameters']['queryFilterEntitlementType']
+        order?: components['parameters']['order']
         /** @description Order by field */
         orderBy?: 'createdAt' | 'updatedAt'
       }
@@ -2237,6 +2253,8 @@ export interface operations {
         pageSize?: components['parameters']['queryPageSize']
         limit?: components['parameters']['queryLimit']
         offset?: components['parameters']['queryOffset']
+        meterSlug?: components['parameters']['queryFilterMeterSlug']
+        order?: components['parameters']['order']
         /** @description Order by field */
         orderBy?: 'id' | 'createdAt' | 'updatedAt'
         /** @description Include archived features. */
@@ -2337,6 +2355,8 @@ export interface operations {
         pageSize?: components['parameters']['queryPageSize']
         limit?: components['parameters']['queryLimit']
         offset?: components['parameters']['queryOffset']
+        subject?: components['parameters']['queryFilterSubject']
+        feature?: components['parameters']['queryFilterFeature']
         order?: components['parameters']['order']
         /** @description Order by field */
         orderBy?: 'id' | 'createdAt' | 'updatedAt'

diff --git a/api/client/python/src/openmeter/_operations/_operations.py b/api/client/python/src/openmeter/_operations/_operations.py
diff --git a/api/client/python/src/openmeter/aio/_operations/_operations.py b/api/client/python/src/openmeter/aio/_operations/_operations.py
diff --git a/api/client/web/src/client/openapi.ts b/api/client/web/src/client/openapi.ts
@@ -1763,6 +1763,18 @@ export interface components {
      * Usage: `?feature=feature-1&feature=feature-2`
      */
     queryFilterFeature?: string[]
+    /**
+     * @description Filtering by multiple meterSlug.
+     *
+     * Usage: `?meterSlug=meter-1&meterSlug=meter-2`
+     */
+    queryFilterMeterSlug?: string[]
+    /**
+     * @description Filtering by multiple entitlement types.
+     *
+     * Usage: `?entitlementType=metered&entitlementType=static`
+     */
+    queryFilterEntitlementType?: string[]
     queryFilterGroupBy?: {
       [key: string]: string
     }
@@ -2210,6 +2222,10 @@ export interface operations {
         pageSize?: components['parameters']['queryPageSize']
         limit?: components['parameters']['queryLimit']
         offset?: components['parameters']['queryOffset']
+        subject?: components['parameters']['queryFilterSubject']
+        feature?: components['parameters']['queryFilterFeature']
+        entitlementType?: components['parameters']['queryFilterEntitlementType']
+        order?: components['parameters']['order']
         /** @description Order by field */
         orderBy?: 'createdAt' | 'updatedAt'
       }
@@ -2237,6 +2253,8 @@ export interface operations {
         pageSize?: components['parameters']['queryPageSize']
         limit?: components['parameters']['queryLimit']
         offset?: components['parameters']['queryOffset']
+        meterSlug?: components['parameters']['queryFilterMeterSlug']
+        order?: components['parameters']['order']
         /** @description Order by field */
         orderBy?: 'id' | 'createdAt' | 'updatedAt'
         /** @description Include archived features. */
@@ -2337,6 +2355,8 @@ export interface operations {
         pageSize?: components['parameters']['queryPageSize']
         limit?: components['parameters']['queryLimit']
         offset?: components['parameters']['queryOffset']
+        subject?: components['parameters']['queryFilterSubject']
+        feature?: components['parameters']['queryFilterFeature']
         order?: components['parameters']['order']
         /** @description Order by field */
         orderBy?: 'id' | 'createdAt' | 'updatedAt'