souls 0.65.3 → 0.66.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f067eba7f9bf393c19177e68748534be2a5a728543fa5962dc4e5bc11a8d89f4
-  data.tar.gz: 6f954ae664e35fe87252152d75c91ae13aa2da150ee5447c072b43cc8426c5c4
+  metadata.gz: 9a7da49346f5cb49477a929afda1b0f1801ea0938df4d27637d7c12bf789df3f
+  data.tar.gz: b2487e19cdd33f995156e5ee88aa2c0cc70d75f648b10ff7fd88a75523027096
 SHA512:
-  metadata.gz: 72b65bc98b779719626ff4b95890da9ec4e0740a1eccb981c95de7346934c7e73a813e4ceaefec947c9d2b82fcd17a2e08ad09d111acbf4fe975831441be92e7
-  data.tar.gz: f341b2cba0d2223038a60be61c393e3ba5ce779947e1f0d1ad7aa065adac38c33139dc14f86d622649535033c96b9c00bea4950a19ab6fe210585355b481e483
+  metadata.gz: df988ebc91a052c2940313a73d4b5e65c42d59283155ae97b32cced8aabe8ee3003ca761202473873ab8b89e69a1526ad63177f257b776d04cad61e930bd40be
+  data.tar.gz: f34f43a3669d2a694206cd5edacec21766544c80f3e5e50a61599267330f1f2c929cf931ceb20147cfe31506e1ed68cb2255da3eb82afeda7d11d90a0eee952b

data/lib/souls/cli/generate/mutation.rb

@@ -45,7 +45,7 @@ module Souls
           type = Souls.type_check(param[:type])
           type = "[#{type}]" if param[:array]
           type = "String" if param[:column_name].match?(/$*_id\z/)
-          next if params[:column_name] == "user_id"
+          next if param[:column_name] == "user_id"
 
           if i == params[:params].size - 1
             f.write("      argument :#{param[:column_name]}, #{type}, required: false\n\n")
@@ -116,11 +116,12 @@ module Souls
           type = Souls.type_check(param[:type])
           type = "[#{type}]" if param[:array]
           type = "String" if param[:column_name].match?(/$*_id\z/)
-          next if col[:column_name] == "user_id"
+          next if param[:column_name] == "user_id"
 
           if i == params[:params].size - 1
             f.write("      argument :#{param[:column_name]}, #{type}, required: false\n\n")
             f.write("      def resolve(args)\n")
+            f.write("      _, data_id = SoulsApiSchema.from_global_id(args[:id])\n")
           else
             f.write("      argument :#{param[:column_name]}, #{type}, required: false\n")
           end
@@ -140,12 +141,11 @@ module Souls
               ", #{n[:column_name]}: #{n[:column_name]}"
             end
           f.write("        new_record = { **args #{relation_params.compact.join} }\n")
-          f.write("        data = ::#{singularized_class_name.camelize}.find(article_id)\n")
-          f.write("        data.update(new_record)\n")
         else
-          f.write("        data = ::#{singularized_class_name.camelize}.find(args[:id])\n")
-          f.write("        data.update(args)\n")
+          f.write("        new_record = args.except(:id)\n")
         end
+        f.write("        data = ::#{singularized_class_name.camelize}.find(data_id)\n")
+        f.write("        data.update(new_record)\n")
       end
       File.open(file_path, "a") do |new_line|
         new_line.write(<<~TEXT)

data/lib/souls/cli/generate/mutation_rbs.rb

@@ -61,7 +61,11 @@ module Souls
             rbs_type = Souls.rbs_type_check(param[:type])
             type = "[#{type}]" if param[:array]
             if i.zero?
-              f.write("        def self.argument: (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+              if param[:column_name].match?(/$*_id\z/)
+                f.write("        def self.argument: (:#{param[:column_name]}, String, required: false ) -> #{rbs_type}\n")
+              else
+                f.write("        def self.argument: (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+              end
             elsif param[:column_name].match?(/$*_id\z/)
               f.write("                         | (:#{param[:column_name]}, String, required: false ) -> String\n")
             else
@@ -114,9 +118,12 @@ module Souls
           TEXT
         end
         File.open(file_path, "a") do |f|
-          params[:params].each_with_index do |param, i|
+          cols = params[:params].reject { |n| n[:column_name] == "user_id" }
+          cols.each_with_index do |param, i|
             type = Souls.rbs_type_check(param[:type])
             type = "[#{type}]" if param[:array]
+            type = "String" if param[:column_name].match?(/$*_id\z/)
+
             if i == params[:params].size - 1
               f.write("                          #{param[:column_name]}: #{type}?\n")
             else
@@ -131,10 +138,14 @@ module Souls
         # rubocop:enable Layout/LineLength
 
         File.open(file_path, "a") do |f|
-          params[:params].each_with_index do |param, i|
+          cols = params[:params].reject { |n| n[:column_name] == "user_id" }
+          cols.each_with_index do |param, i|
             type = Souls.type_check(param[:type])
             rbs_type = Souls.rbs_type_check(param[:type])
             type = "[#{type}]" if param[:array]
+            type = "String" if param[:column_name].match?(/$*_id\z/)
+            rbs_type = "String" if param[:column_name].match?(/$*_id\z/)
+
             required = param[:column_name] == "id" ? "required: true" : "required: false"
             if i.zero?
               f.write("        def self.argument: (:#{param[:column_name]}, #{type}, #{required} ) -> #{rbs_type}\n")

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module Souls
-  VERSION = "0.65.3".freeze
+  VERSION = "0.66.1".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.44.3
+0.45.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.44.3
+0.45.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.65.3
+  version: 0.66.1
 platform: ruby
 authors:
 - POPPIN-FUMI