CV2-3777: add smooch_request_type field

meedan · Oct 19, 2023 · 575e970 · 575e970
1 parent 77ff15e
commit 575e970
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 19 deletions.
diff --git a/app/graph/types/query_type.rb b/app/graph/types/query_type.rb
@@ -202,19 +202,6 @@ def dynamic_annotation_field(query:, only_cache: nil)
     end
   end
 
-  field :tipline_request,
-        TiplineRequestType,
-        description:
-          "Information about tipline request, given its id",
-        null: true do
-    argument :id, GraphQL::Types::String, required: true
-  end
-
-  def tipline_request(id:)
-    ability = context[:ability] || Ability.new
-    DynamicAnnotation::Field.find_by_id(id.to_i) if ability.can?(:find_by_json_fields, DynamicAnnotation::Field.new)
-  end
-
   # Getters by ID
   %i[
     source

diff --git a/app/graph/types/tipline_request_type.rb b/app/graph/types/tipline_request_type.rb
@@ -15,4 +15,5 @@ class TiplineRequestType < DefaultObject
   field :smooch_user_request_language, GraphQL::Types::String, null: true
   field :smooch_report_sent_at, GraphQL::Types::Int, null: true
   field :smooch_report_correction_sent_at, GraphQL::Types::Int, null: true
+  field :smooch_request_type, GraphQL::Types::String, null: true
 end
diff --git a/app/models/concerns/smooch_fields.rb b/app/models/concerns/smooch_fields.rb
@@ -77,6 +77,12 @@ def smooch_report_correction_sent_at
         end
       end
 
+      def smooch_request_type
+        Concurrent::Future.execute(executor: CheckGraphql::POOL) do
+          begin self.annotation.load.get_field_value('smooch_request_type') rescue nil end
+        end
+      end
+
       def smooch_user_request_language
         Concurrent::Future.execute(executor: CheckGraphql::POOL) do
           return '' unless self.field_name == 'smooch_data'

diff --git a/lib/relay.idl b/lib/relay.idl
@@ -11753,9 +11753,9 @@ type Query {
   team(id: ID, random: String, slug: String): Team
 
   """
-  Information about tipline request, given its id
+  Information about the tipline_message with given id
   """
-  tipline_request(id: String!): TiplineRequest
+  tipline_message(id: ID!): TiplineMessage
 
   """
   Information about the user with given id
@@ -13532,6 +13532,7 @@ type TiplineRequest implements Node {
   smooch_report_received_at: Int
   smooch_report_sent_at: Int
   smooch_report_update_received_at: Int
+  smooch_request_type: String
   smooch_user_external_identifier: String
   smooch_user_request_language: String
   smooch_user_slack_channel_url: String

diff --git a/public/relay.json b/public/relay.json
@@ -61864,8 +61864,8 @@
               "deprecationReason": null
             },
             {
-              "name": "tipline_request",
-              "description": "Information about tipline request, given its id",
+              "name": "tipline_message",
+              "description": "Information about the tipline_message with given id",
               "args": [
                 {
                   "name": "id",
@@ -61875,7 +61875,7 @@
                     "name": null,
                     "ofType": {
                       "kind": "SCALAR",
-                      "name": "String",
+                      "name": "ID",
                       "ofType": null
                     }
                   },
@@ -61886,7 +61886,7 @@
               ],
               "type": {
                 "kind": "OBJECT",
-                "name": "TiplineRequest",
+                "name": "TiplineMessage",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -71075,6 +71075,20 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "smooch_request_type",
+              "description": null,
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "smooch_user_external_identifier",
               "description": null,