souls 0.64.3 → 0.65.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3a33999e189283758881dbe8f9d0a7222580ca0b359363d845142aecc6faf63
-  data.tar.gz: addf19b1163e5ae31937b0fe49ce464ed4de286d1edc013385a968dd721f858d
+  metadata.gz: f067eba7f9bf393c19177e68748534be2a5a728543fa5962dc4e5bc11a8d89f4
+  data.tar.gz: 6f954ae664e35fe87252152d75c91ae13aa2da150ee5447c072b43cc8426c5c4
 SHA512:
-  metadata.gz: f19ae2ed49b96c8ac03e5944c79ac9f0cd8da0a4e7875660c83236c0cc645c16f064c4f97fa53d1b7c9ee3ae61ad9648c1cd3a4f84c038034ed57743cca7edc2
-  data.tar.gz: e95ee79d899afb8a255018c6d0da216e400f0689690cb2d1cc4a83f30c644ee7f2d7d35597f17a0ab07db1e887b1e0b29e7d786c51ab6d620351384f07b65d8d
+  metadata.gz: 72b65bc98b779719626ff4b95890da9ec4e0740a1eccb981c95de7346934c7e73a813e4ceaefec947c9d2b82fcd17a2e08ad09d111acbf4fe975831441be92e7
+  data.tar.gz: f341b2cba0d2223038a60be61c393e3ba5ce779947e1f0d1ad7aa065adac38c33139dc14f86d622649535033c96b9c00bea4950a19ab6fe210585355b481e483

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

@@ -45,6 +45,8 @@ 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"
+
           if i == params[:params].size - 1
             f.write("      argument :#{param[:column_name]}, #{type}, required: false\n\n")
             f.write("      def resolve(args)\n")
@@ -89,94 +91,67 @@ module Souls
       file_path
     end
 
-    ## 2.Mutation - Update
-    def update_mutation_head(class_name: "user")
+    def update_mutation(class_name: "user")
       singularized_class_name = class_name.singularize.underscore
       file_dir = "./app/graphql/mutations/base/#{singularized_class_name}"
-      file_path = "#{file_dir}/update_#{class_name}.rb"
-      File.open(file_path, "w") do |new_line|
-        new_line.write(<<~TEXT)
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_path = "#{file_dir}/update_#{singularized_class_name}.rb"
+      raise(Thor::Error, "Mutation RBS already exist! #{file_path}") if File.exist?(file_path)
+
+      params = Souls.get_relation_params(class_name: singularized_class_name, col: "mutation")
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
           module Mutations
-            module Base::#{class_name.camelize}
-              class Update#{class_name.camelize} < BaseMutation
-                field :#{class_name}_edge, Types::#{class_name.camelize}Type.edge_type, null: false
+            module Base::#{singularized_class_name.camelize}
+              class Update#{singularized_class_name.camelize} < BaseMutation
+                field :#{singularized_class_name}_edge, Types::#{singularized_class_name.camelize}Type.edge_type, null: false
+                field :error, String, null: true
 
                 argument :id, String, required: true
         TEXT
       end
-      file_path
-    end
-
-    def update_mutation_params(class_name: "user")
-      file_path = "./app/graphql/mutations/base/#{class_name}/update_#{class_name}.rb"
-      path = "./db/schema.rb"
-      @on = false
-      @user_exist = false
-      @relation_params = []
-      File.open(file_path, "a") do |new_line|
-        File.open(path, "r") do |f|
-          f.each_line.with_index do |line, _i|
-            if @on
-              if line.include?("t.index") || line.strip == "end"
-                if @user_exist
-                  new_line.write(<<-TEXT)
 
-      def resolve args
-        params = args.dup
-        params[:user_id] = context[:user][:id]
-        _, params[:id] = SoulsApiSchema.from_global_id(args[:id])
-                  TEXT
-                else
-                  new_line.write(<<-TEXT)
+      File.open(file_path, "a") do |f|
+        params[:params].each_with_index do |param, i|
+          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"
 
-      def resolve args
-        params = args.dup
-        _, params[:id] = SoulsApiSchema.from_global_id(args[:id])
-                  TEXT
-                end
-                break
-              end
-              field = "[String]" if line.include?("array: true")
-              type, name = line.split(",")[0].gsub("\"", "").scan(/((?<=t\.).+(?=\s)) (.+)/)[0]
-              field ||= Souls.type_check(type)
-              case name
-              when "user_id"
-                @user_exist = true
-              when /$*_id\z/
-                @relation_params << name
-                new_line.write("      argument :#{name}, String, required: false\n")
-              when "created_at", "updated_at"
-                next
-              else
-                new_line.write("      argument :#{name}, #{field}, required: false\n")
-              end
-            end
-            @on = true if Souls.table_check(line: line, class_name: class_name)
+          if i == params[:params].size - 1
+            f.write("      argument :#{param[:column_name]}, #{type}, required: false\n\n")
+            f.write("      def resolve(args)\n")
+          else
+            f.write("      argument :#{param[:column_name]}, #{type}, required: false\n")
           end
         end
       end
-      @relation_params
-    end
 
-    def update_mutation_after_params(class_name: "article", relation_params: [])
-      return false if relation_params.empty?
+      File.open(file_path, "a") do |f|
+        if params[:relation_params]
+          f.write("        user_id = context[:user][:id]\n") if params[:user_exist]
+          params[:relation_params].each_with_index do |col, _i|
+            next if col[:column_name] == "user_id"
 
-      file_path = "./app/graphql/mutations/base/#{class_name}/update_#{class_name}.rb"
-      relation_params.each do |params_name|
-        File.open(file_path, "a") do |new_line|
-          new_line.write("        _, params[:#{params_name}] = SoulsApiSchema.from_global_id(args[:#{params_name}])\n")
+            f.write("      _, #{col[:column_name]} = SoulsApiSchema.from_global_id(args[:#{col[:column_name]}])\n")
+          end
+          relation_params =
+            params[:relation_params].map do |n|
+              ", #{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")
         end
       end
-      true
-    end
-
-    def update_mutation_end(class_name: "user")
-      file_path = "./app/graphql/mutations/base/#{class_name}/update_#{class_name}.rb"
       File.open(file_path, "a") do |new_line|
         new_line.write(<<~TEXT)
-                  #{class_name} = ::#{class_name.camelize}.find params[:id]
-                  #{class_name}.update params
-                  { #{class_name}_edge: { node: ::#{class_name.camelize}.find(params[:id]) } }
+                  raise(StandardError, data.errors.full_messages) unless data.save
+
+                  { #{singularized_class_name}_edge: { node: data } }
                 rescue StandardError => error
                   GraphQL::ExecutionError.new(error.message)
                 end
@@ -189,16 +164,6 @@ module Souls
       file_path
     end
 
-    def update_mutation(class_name: "user")
-      file_path = "./app/graphql/mutations/base/#{class_name}/update_#{class_name}.rb"
-      return "Mutation already exist! #{file_path}" if File.exist?(file_path)
-
-      update_mutation_head(class_name: class_name)
-      relation_params = update_mutation_params(class_name: class_name)
-      update_mutation_after_params(class_name: class_name, relation_params: relation_params)
-      update_mutation_end(class_name: class_name)
-    end
-
     # 3. Mutation - Delete
     def delete_mutation(class_name: "user")
       file_path = "./app/graphql/mutations/base/#{class_name}/delete_#{class_name}.rb"

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

@@ -42,6 +42,8 @@ module Souls
             type = "[#{type}]" if param[:array]
             if i == params[:params].size - 1
               f.write("                          #{param[:column_name]}: #{type}?\n")
+            elsif param[:column_name].match?(/$*_id\z/)
+              f.write("                          #{param[:column_name]}: String?,\n")
             else
               f.write("                          #{param[:column_name]}: #{type}?,\n")
             end
@@ -60,6 +62,8 @@ module Souls
             type = "[#{type}]" if param[:array]
             if i.zero?
               f.write("        def self.argument: (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
+            elsif param[:column_name].match?(/$*_id\z/)
+              f.write("                         | (:#{param[:column_name]}, String, required: false ) -> String\n")
             else
               f.write("                         | (:#{param[:column_name]}, #{type}, required: false ) -> #{rbs_type}\n")
             end

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

@@ -25,7 +25,15 @@ module Souls
             type = "[#{type}]" if param[:array]
             rbs_type = Souls.rbs_type_check(param[:type])
             if i.zero?
-              f.write("    def self.field: (:#{param[:column_name]}, #{type}, null: true) -> #{rbs_type}\n")
+              if param[:column_name].match?(/$*_id\z/)
+                col_name = param[:column_name].gsub("_id", "")
+                f.write("    def self.field: (:#{col_name}, untyped, null: false) -> untyped\n")
+              else
+                f.write("    def self.field: (:#{param[:column_name]}, #{type}, null: true) -> #{rbs_type}\n")
+              end
+            elsif param[:column_name].match?(/$*_id\z/)
+              col_name = param[:column_name].gsub("_id", "")
+              f.write("                  | (:#{col_name}, untyped, null: false) -> untyped\n")
             else
               f.write("                  | (:#{param[:column_name]}, #{type}, null: true) -> #{rbs_type}\n")
             end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.43.3
+0.44.3

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.43.3
+0.44.3

metadata

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