graphql_helper_generator 0.0.27 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 247bdaf39994a1e2b8af2c3e4226f5569beeaef0cecc7b5578a7bd215787bb37
-  data.tar.gz: fdf111f46744c473478e09dfd291fe484b0e3be23b082caca1d6cdae4b4c4c10
+  metadata.gz: bca943f26c61af0614bacdd31a2b776da3a6f92c88124e18ec68257ec1b4930e
+  data.tar.gz: 208b19070a3ffdcf35b0cd897957ded5ef57d3cb361299cfab804b5a1c142d97
 SHA512:
-  metadata.gz: 6398c9d099e065bf54381b65186d34b72f2b3549d0b92bd9da70aec6e70ff24d308523297cd42a7572fb8e4b3c12e7168cf8ccfefeb0c36ef810b4f3d1460afb
-  data.tar.gz: 2e2454c3ec7bc21b8971b4c84913ee923a2ca1bdc93e4bc491fd525feaf4463243b51b3e48ac88777c6feef0e8775fbf4b9fb142635adbd7ea5e241af219f7d9
+  metadata.gz: 7a1c23d2cc09e601a5b9867a36c1fa36c9e37f23e8aa1ea66c540d0ed356aea372aabf269d0fcdea58709f7f48aae456e7bb65aaa01fb68ddfe29b8f37e29b59
+  data.tar.gz: c976e04a571870e6c5fdca9e551fbbfe38f452c2b5082480ca55b3907b41d5cd41beb1e30762ff1aad6b3ef9fd4a13d165cc9e1b4096ddefc5f3a55ca5288dc5

data/lib/graphql_helper_generator/graphql_model/graphql_model_generator.rb

@@ -101,6 +101,7 @@ class GraphqlModelGenerator < Rails::Generators::NamedBase
 
   def generate_create_test
     generate_create_test_lines
+    generate_references_creation
     filename = "create_" + @snake_case_name + "_spec.rb"
     dir = "spec/requests/" + filename
 
@@ -135,8 +136,6 @@ class GraphqlModelGenerator < Rails::Generators::NamedBase
 
       {name: name, type: type, required: required, array: array, reference: reference}
     }
-
-    # print_array(@parsed_fields, "Parsed vars")
   end
 
   def generate_update_mutation_lines
@@ -144,7 +143,7 @@ class GraphqlModelGenerator < Rails::Generators::NamedBase
       @parsed_fields.map{|field|
         str = 'argument :'
         if field[:reference].present? || field[:type] == 'references'
-          str = '# ' + str + field[:name].underscore + "s"
+          str = '# ' + str + field[:name].underscore + "_id"
         else
           str += field[:name].underscore
         end
@@ -153,7 +152,7 @@ class GraphqlModelGenerator < Rails::Generators::NamedBase
 
         type = cast_to_graphql(field)
           
-        if field[:reference].present? then type = field[:name].camelize + "InputType" end
+        if field[:reference].present? then type = "ID" end
         if field[:array].present? then type = "[" + type + "]" end
         str += type + ', required: false'
         str
@@ -220,11 +219,7 @@ class GraphqlModelGenerator < Rails::Generators::NamedBase
         if field[:array].present? then type = "[" + type + "]" end
 
         str += type
-        if field[:required].present?
-          str += ', required: true'
-        else
-          str += ', required: false'
-        end
+        str += add_required(field)
         str
       }
   end
@@ -238,13 +233,16 @@ class GraphqlModelGenerator < Rails::Generators::NamedBase
         if field[:reference].present? || field[:type] == 'references' then type = field[:name].camelize + "Type" end
         if field[:array].present? then type = "[" + type + "]" end
         str += type
-        if field[:required].present? then 
-          str += ', null: false' 
+        str += add_null(field)
+
+        if field[:type] == 'references'
+          ref_id = 'field :' + field[:name].underscore + '_id, ID'
+          ref_id += add_null(field)
+          [str, ref_id]
         else 
-          str += ', null: true'
+          str
         end
-        str
-      }
+      }.flatten
   end
 
   def generate_model_lines
@@ -273,6 +271,17 @@ class GraphqlModelGenerator < Rails::Generators::NamedBase
       }
   end
 
+  def generate_references_creation
+    references = @parsed_fields.filter{|x| x[:type] == 'references'}
+    @create_reference =
+      references.map{|field|
+        "#{field[:name]} = create(:#{field[:name]})\n"
+      }
+
+    @include_references =
+      references.map{|field| ", #{field[:name]}: #{field[:name]}"}
+  end
+
   # 
   # Helpers
   #
@@ -316,6 +325,22 @@ class GraphqlModelGenerator < Rails::Generators::NamedBase
     type
   end
 
+  def add_required(field)
+    if field[:required].present?
+      ', required: true'
+    else
+      ', required: false'
+    end
+  end
+
+  def add_null(field)
+    if field[:required].present? then 
+      ', null: false' 
+    else 
+      ', null: true'
+    end
+  end
+
   def handle_reference(options, type)
     if not type == 'references' 
       return false

data/lib/graphql_helper_generator/graphql_model/templates/tests/create_test_template.erb

@@ -20,7 +20,8 @@ RSpec.describe 'Create<%= @camelize_name %>', type: :request, current: true do
   end
 
   it 'create_<%= @snake_case_name %> success' do
-  <%= @snake_case_name%> = build(:<%= @snake_case_name %>)
+    <% for field in @create_reference %><%=field%><% end %>
+    <%= @snake_case_name%> = build(:<%= @snake_case_name %><%= @include_references.map{|x| x}.join%>)
     variables = as_json(<%= @snake_case_name%>)
 
     json = graphql(query, variables: variables)

data/lib/graphql_helper_generator/graphql_model/templates/tests/delete_test_template.erb

@@ -31,7 +31,7 @@ RSpec.describe 'Delete<%= @camelize_name %>', type: :request, current: true do
       @parsed_fields.filter{|f| !f[:reference].present? }.map{|field| 
         var = field[:name].camelize
         var[0] = var[0].downcase
-        "expect(data).to include('#{var}' => updated_#{@snake_case_name}.#{field[:name]})"
+        "# expect(data).to include('#{var}' => #{@snake_case_name}.#{field[:name]})"
       }.join("\n    ")
     %>
 

data/lib/graphql_helper_generator/graphql_model/templates/tests/factory_template.erb

@@ -10,8 +10,12 @@ FactoryBot.define do
             "rand(1..10000)"
           when "boolean"
             "false"
+          when "datetime"
+            "(Time.now + #{rand(1..5)}.hours).to_s"
           when "json"
-            {hello: :world, new: 1}
+            {"hello": "world", "new": 1}
+          when "references"
+            "create(:#{field[:name]})"
           else
             'nil'
           end
@@ -32,8 +36,12 @@ FactoryBot.define do
             "rand(1..10000)"
           when "boolean"
             "false"
+          when "datetime"
+            "(Time.now + #{rand(1..5)}.hours).to_s"
           when "json"
-            {hello: :updated_world, updated: 100}
+            {"hello": "updated_world", "new_field": 100}
+          when "references"
+            "create(:#{field[:name]})"
           else
             'nil'
           end

data/lib/graphql_helper_generator/graphql_model/templates/tests/update_test_template.erb

@@ -23,7 +23,7 @@ RSpec.describe 'Update<%= @camelize_name %>', type: :request, current: true do
     <%= @snake_case_name%> = create(:<%= @snake_case_name %>)
     updated_<%= @snake_case_name%> = build(:updated_<%= @snake_case_name %>)
     updated_<%= @snake_case_name%>.id = <%= @snake_case_name %>.id
-    variables = updated_<%= @snake_case_name%>.to_json
+    variables = as_json(updated_<%= @snake_case_name%>)
 
     json = graphql(query, variables: variables)
     data = json['update<%= @camelize_name %>']

data/lib/graphql_helper_generator/version.rb

@@ -1,3 +1,3 @@
 module GraphqlHelperGenerator
-  VERSION = "0.0.27"
+  VERSION = "0.0.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql_helper_generator
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.30
 platform: ruby
 authors:
 - Oleg Savinov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-18 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,7 +55,6 @@ files:
 - lib/graphql_helper_generator/graphql_model/USAGE
 - lib/graphql_helper_generator/graphql_model/graphql_model_generator.rb
 - lib/graphql_helper_generator/graphql_model/templates/graphql_types/input_type_template.erb
-- lib/graphql_helper_generator/graphql_model/templates/graphql_types/test/create_test.erb
 - lib/graphql_helper_generator/graphql_model/templates/graphql_types/type_template.erb
 - lib/graphql_helper_generator/graphql_model/templates/migration_template.erb
 - lib/graphql_helper_generator/graphql_model/templates/model_template.erb