Merge pull request #1716 from OpenC3/fix_migrations

Fix migrations

Author: ryanmelt

openc3/bin/openc3cli

@@ -523,7 +523,7 @@ def run_migrations(folder)
     if extension == '.rb' and not migrations[name]
       unless brand_new
         puts "Running Migration: #{name}"
-        require File.join(folder, entry)
+        require entry
       end
       OpenC3::MigrationModel.new(name: name).create
     end

openc3/lib/openc3/migrations/20241107120000_no_critical_cmd.rb

@@ -2,16 +2,16 @@
 require 'openc3/models/scope_model'
 require 'openc3/models/microservice_model'
 
-begin
-  require 'openc3-enterprise/models/cmd_authority_model'
-  require 'openc3-enterprise/models/critical_cmd_model'
-  BASE = false
-rescue LoadError
-  BASE = true
-end
-
 module OpenC3
   class NoCriticalCmd < Migration
+    begin
+      require 'openc3-enterprise/models/cmd_authority_model'
+      require 'openc3-enterprise/models/critical_cmd_model'
+      BASE = false
+    rescue LoadError
+      BASE = true
+    end
+
     def self.run
       if BASE # Only remove the critical command model if we're not enterprise
         ScopeModel.get_all_models(scope: nil).each do |scope, scope_model|

openc3/lib/openc3/migrations/20241107120000_no_trigger_group.rb

@@ -0,0 +1,29 @@
+require 'openc3/utilities/migration'
+require 'openc3/models/scope_model'
+require 'openc3/models/microservice_model'
+
+module OpenC3
+  class NoTriggerGroups < Migration
+    begin
+      require 'openc3-enterprise/models/cmd_authority_model'
+      require 'openc3-enterprise/models/critical_cmd_model'
+      BASE = false
+    rescue LoadError
+      BASE = true
+    end
+
+    def self.run
+      if BASE # Only remove the trigger group microservice if we're not enterprise
+        MicroserviceModel.get_all_models(scope: 'DEFAULT').each do |microservice_name, microservice_model|
+          if microservice_name =~ /__TRIGGER_GROUP__/
+            microservice_model.destroy
+          end
+        end
+      end
+    end
+  end
+end
+
+unless ENV['OPENC3_NO_MIGRATE']
+  OpenC3::NoTriggerGroups.run
+end

openc3/lib/openc3/models/scope_model.rb

@@ -74,13 +74,13 @@ def self.all(scope: nil)
       super(PRIMARY_KEY)
     end
 
-    def self.from_json(json)
+    def self.from_json(json, scope: nil)
       json = JSON.parse(json, :allow_nan => true, :create_additions => true) if String === json
       raise "json data is nil" if json.nil?
       self.new(**json.transform_keys(&:to_sym))
     end
 
-    def self.get_model(name:)
+    def self.get_model(name:, scope: nil)
       json = get(name: name)
       if json
         return from_json(json)