From 99d41f560476cc35ea64d175deec085513263cbf Mon Sep 17 00:00:00 2001
From: 0x1eef <0x1eef@protonmail.com>
Date: Thu, 23 May 2024 22:53:54 -0300
Subject: [PATCH] Add init.rb

---
 cli/lib/twenty/cli/command.rb                            | 2 +-
 server/lib/twenty/server.rb                              | 6 +++---
 server/lib/twenty/server/graphql.rb                      | 9 ---------
 server/lib/twenty/server/graphql/init.rb                 | 9 +++++++++
 .../twenty/server/{migration.rb => migration/init.rb}    | 2 +-
 server/lib/twenty/server/{model.rb => model/init.rb}     | 8 ++++----
 server/lib/twenty/server/{rack.rb => rack/init.rb}       | 2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 server/lib/twenty/server/graphql.rb
 create mode 100644 server/lib/twenty/server/graphql/init.rb
 rename server/lib/twenty/server/{migration.rb => migration/init.rb} (93%)
 rename server/lib/twenty/server/{model.rb => model/init.rb} (56%)
 rename server/lib/twenty/server/{rack.rb => rack/init.rb} (87%)

diff --git a/cli/lib/twenty/cli/command.rb b/cli/lib/twenty/cli/command.rb
index b29fd56..315d252 100644
--- a/cli/lib/twenty/cli/command.rb
+++ b/cli/lib/twenty/cli/command.rb
@@ -20,6 +20,6 @@ class Twenty::Command < Cmd
   private
 
   def require_models!
-    require "twenty/server/model"
+    require "twenty/server/model/init"
   end
 end
diff --git a/server/lib/twenty/server.rb b/server/lib/twenty/server.rb
index 6ec2334..70691b1 100644
--- a/server/lib/twenty/server.rb
+++ b/server/lib/twenty/server.rb
@@ -59,7 +59,7 @@ module Twenty
   end
 
   require "sequel"
-  require_relative "server/migration"
-  require_relative "server/graphql"
-  require_relative "server/rack"
+  require_relative "server/migration/init"
+  require_relative "server/graphql/init"
+  require_relative "server/rack/init"
 end
diff --git a/server/lib/twenty/server/graphql.rb b/server/lib/twenty/server/graphql.rb
deleted file mode 100644
index e948d1a..0000000
--- a/server/lib/twenty/server/graphql.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Twenty::GraphQL
-  require "graphql"
-  require_relative "graphql/input"
-  require_relative "graphql/mutation"
-  require_relative "graphql/type"
-  require_relative "graphql/schema"
-end
diff --git a/server/lib/twenty/server/graphql/init.rb b/server/lib/twenty/server/graphql/init.rb
new file mode 100644
index 0000000..903a878
--- /dev/null
+++ b/server/lib/twenty/server/graphql/init.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Twenty::GraphQL
+  require "graphql"
+  require_relative "input"
+  require_relative "mutation"
+  require_relative "type"
+  require_relative "schema"
+end
diff --git a/server/lib/twenty/server/migration.rb b/server/lib/twenty/server/migration/init.rb
similarity index 93%
rename from server/lib/twenty/server/migration.rb
rename to server/lib/twenty/server/migration/init.rb
index f6fb733..7f51723 100644
--- a/server/lib/twenty/server/migration.rb
+++ b/server/lib/twenty/server/migration/init.rb
@@ -7,7 +7,7 @@ module Twenty::Migration
   # @return [String]
   #  Returns the path to the migrations directory
   def self.migrations_path
-    File.join(__dir__, "migration")
+    __dir__
   end
 
   ##
diff --git a/server/lib/twenty/server/model.rb b/server/lib/twenty/server/model/init.rb
similarity index 56%
rename from server/lib/twenty/server/model.rb
rename to server/lib/twenty/server/model/init.rb
index e51a674..b402b4b 100644
--- a/server/lib/twenty/server/model.rb
+++ b/server/lib/twenty/server/model/init.rb
@@ -6,8 +6,8 @@ module Twenty::Model
     model.plugin(:timestamps, update_on_create: true)
   end
 
-  require_relative "model/mixin/colorable"
-  require_relative "model/project"
-  require_relative "model/task"
-  require_relative "model/milestone"
+  require_relative "mixin/colorable"
+  require_relative "project"
+  require_relative "task"
+  require_relative "milestone"
 end
diff --git a/server/lib/twenty/server/rack.rb b/server/lib/twenty/server/rack/init.rb
similarity index 87%
rename from server/lib/twenty/server/rack.rb
rename to server/lib/twenty/server/rack/init.rb
index a9f752c..af555e6 100644
--- a/server/lib/twenty/server/rack.rb
+++ b/server/lib/twenty/server/rack/init.rb
@@ -2,7 +2,7 @@
 
 module Twenty::Rack
   require "server"
-  require_relative "rack/graphql"
+  require_relative "graphql"
 
   ##
   # @param [Hash, #to_h] options