Remove properties from billable metric mutation

getlago · Mar 24, 2022 · c50af28 · c50af28
1 parent d94aee7
commit c50af28
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 84 deletions.
diff --git a/app/graphql/mutations/billable_metrics/create.rb b/app/graphql/mutations/billable_metrics/create.rb
@@ -12,7 +12,6 @@ class Create < BaseMutation
       argument :code, String, required: true
       argument :description, String
       argument :aggregation_type, Types::BillableMetrics::AggregationTypeEnum, required: true
-      argument :properties, GraphQL::Types::JSON
 
       type Types::BillableMetrics::Object
 

diff --git a/app/graphql/mutations/billable_metrics/update.rb b/app/graphql/mutations/billable_metrics/update.rb
@@ -12,7 +12,6 @@ class Update < BaseMutation
       argument :code, String, required: true
       argument :description, String
       argument :aggregation_type, Types::BillableMetrics::AggregationTypeEnum, required: true
-      argument :properties, GraphQL::Types::JSON
 
       type Types::BillableMetrics::Object
 

diff --git a/app/graphql/types/billable_metrics/object.rb b/app/graphql/types/billable_metrics/object.rb
@@ -12,7 +12,6 @@ class Object < Types::BaseObject
       field :code, String, null: false
       field :description, String
       field :aggregation_type, Types::BillableMetrics::AggregationTypeEnum, null: false
-      field :properties, GraphQL::Types::JSON
 
       field :created_at, GraphQL::Types::ISO8601DateTime, null: false
       field :updated_at, GraphQL::Types::ISO8601DateTime, null: false

diff --git a/app/services/billable_metrics_service.rb b/app/services/billable_metrics_service.rb
@@ -11,8 +11,7 @@ def create(**args)
       name: args[:name],
       code: args[:code],
       description: args[:description],
-      aggregation_type: args[:aggregation_type]&.to_sym,
-      properties: args[:properties]
+      aggregation_type: args[:aggregation_type]&.to_sym
     )
 
     # TODO: better handling of validation errors
@@ -31,7 +30,6 @@ def update(**args)
     metric.code = args[:code]
     metric.description = args[:description] if args[:description]
     metric.aggregation_type = args[:aggregation_type]&.to_sym
-    metric.properties = args[:properties] if args[:properties]
 
     # TODO: better handling of validation errors
     metric.save!

diff --git a/schema.graphql b/schema.graphql
@@ -13,7 +13,6 @@ type BillableMetric {
   id: ID!
   name: String!
   organization: Organization
-  properties: JSON
   updatedAt: ISO8601DateTime!
 }
 
@@ -49,7 +48,6 @@ input CreateBillableMetricInput {
   description: String!
   name: String!
   organizationId: String!
-  properties: JSON!
 }
 
 """
@@ -142,11 +140,6 @@ An ISO 8601-encoded datetime
 """
 scalar ISO8601DateTime
 
-"""
-Represents untyped JSON
-"""
-scalar JSON
-
 type LoginUser {
   token: String!
   user: User!
@@ -306,7 +299,6 @@ input UpdateBillableMetricInput {
   description: String!
   id: String!
   name: String!
-  properties: JSON!
 }
 
 """

diff --git a/schema.json b/schema.json
@@ -171,20 +171,6 @@
 
               ]
             },
-            {
-              "name": "properties",
-              "description": null,
-              "type": {
-                "kind": "SCALAR",
-                "name": "JSON",
-                "ofType": null
-              },
-              "isDeprecated": false,
-              "deprecationReason": null,
-              "args": [
-
-              ]
-            },
             {
               "name": "updatedAt",
               "description": null,
@@ -487,22 +473,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "properties",
-              "description": null,
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "JSON",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "enumValues": null
@@ -970,16 +940,6 @@
           "inputFields": null,
           "enumValues": null
         },
-        {
-          "kind": "SCALAR",
-          "name": "JSON",
-          "description": "Represents untyped JSON",
-          "interfaces": null,
-          "possibleTypes": null,
-          "fields": null,
-          "inputFields": null,
-          "enumValues": null
-        },
         {
           "kind": "OBJECT",
           "name": "LoginUser",
@@ -2255,22 +2215,6 @@
               "defaultValue": null,
               "isDeprecated": false,
               "deprecationReason": null
-            },
-            {
-              "name": "properties",
-              "description": null,
-              "type": {
-                "kind": "NON_NULL",
-                "name": null,
-                "ofType": {
-                  "kind": "SCALAR",
-                  "name": "JSON",
-                  "ofType": null
-                }
-              },
-              "defaultValue": null,
-              "isDeprecated": false,
-              "deprecationReason": null
             }
           ],
           "enumValues": null

diff --git a/spec/graphql/mutations/billable_metrics/create_spec.rb b/spec/graphql/mutations/billable_metrics/create_spec.rb
@@ -28,8 +28,7 @@
           code: 'new_metric',
           description: 'New metric description',
           organizationId: membership.organization_id,
-          aggregationType: 'count_agg',
-          properties: {}
+          aggregationType: 'count_agg'
         }
       }
     )
@@ -55,8 +54,7 @@
             code: 'new_metric',
             description: 'New metric description',
             organizationId: membership.organization_id,
-            aggregationType: 'count_agg',
-            properties: {}
+            aggregationType: 'count_agg'
           }
         }
       )

diff --git a/spec/graphql/mutations/billable_metrics/update_spec.rb b/spec/graphql/mutations/billable_metrics/update_spec.rb
@@ -29,8 +29,7 @@
           name: 'New Metric',
           code: 'new_metric',
           description: 'New metric description',
-          aggregationType: 'count_agg',
-          properties: {}
+          aggregationType: 'count_agg'
         }
       }
     )
@@ -56,8 +55,7 @@
             name: 'New Metric',
             code: 'new_metric',
             description: 'New metric description',
-            aggregationType: 'count_agg',
-            properties: {}
+            aggregationType: 'count_agg'
           }
         }
       )

diff --git a/spec/services/billable_metrics_service_spec.rb b/spec/services/billable_metrics_service_spec.rb
@@ -15,8 +15,7 @@
         code: 'new_metric',
         description: 'New metric description',
         organization_id: organization.id,
-        aggregation_type: 'count_agg',
-        properties: {}
+        aggregation_type: 'count_agg'
       }
     end
 
@@ -60,8 +59,7 @@
         name: 'New Metric',
         code: 'new_metric',
         description: 'New metric description',
-        aggregation_type: 'count_agg',
-        properties: {}
+        aggregation_type: 'count_agg'
       }
     end
 
@@ -86,8 +84,7 @@
           name: nil,
           code: 'new_metric',
           description: 'New metric description',
-          aggregation_type: 'count_agg',
-          properties: {}
+          aggregation_type: 'count_agg'
         }
       end