Change clockwork by rufus scheduler

.rubocop.yml

@@ -41,6 +41,8 @@ Minitest/MultipleAssertions:
 Performance/StringIdentifierArgument:
   Enabled: false
 
+Rails/CreateTableWithTimestamps:
+  Enabled: false
 Rails/HttpStatus:
   EnforcedStyle: numeric
 

Gemfile

@@ -21,10 +21,10 @@ gem "turbo-rails"
 
 ## LIBRARIES
 gem "bootsnap", require: false
-gem "clockwork"
 gem "foreman"
 gem "http"
 gem "rmodbus"
+gem "rufus-scheduler"
 gem "solid_queue"
 gem "sqids"
 

Gemfile.lock

@@ -97,9 +97,6 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    clockwork (3.0.2)
-      activesupport
-      tzinfo
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
     crass (1.0.6)
@@ -116,11 +113,16 @@ GEM
     drb (2.2.0)
       ruby2_keywords
     erubi (1.12.0)
+    et-orbi (1.2.7)
+      tzinfo
     ffi (1.16.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
     foreman (0.87.2)
+    fugit (1.9.0)
+      et-orbi (~> 1, >= 1.2.7)
+      raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
     http (5.1.1)
@@ -190,6 +192,7 @@ GEM
     public_suffix (5.0.3)
     puma (6.4.2)
       nio4r (~> 2.0)
+    raabro (1.4.0)
     racc (1.7.3)
     rack (3.0.8)
     rack-session (2.0.0)
@@ -267,6 +270,8 @@ GEM
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
+    rufus-scheduler (3.9.1)
+      fugit (~> 1.1, >= 1.1.6)
     selenium-webdriver (4.16.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -322,7 +327,6 @@ DEPENDENCIES
   better_errors
   bootsnap
   capybara
-  clockwork
   debug
   dotenv-rails
   foreman
@@ -337,6 +341,7 @@ DEPENDENCIES
   rubocop-minitest
   rubocop-performance
   rubocop-rails
+  rufus-scheduler
   selenium-webdriver
   solid_queue
   sqids

Procfile

@@ -1,3 +1,3 @@
 web: bin/puma -C config/puma.rb
 job: bin/rails solid_queue:start
-clock: bin/clockwork config/clockwork.rb
+scheduler: bin/rails run config/scheduler.rb

app/lib/solaris/loop.rb

@@ -11,7 +11,7 @@ def run
     private
 
     def archive_interval
-      ENV.fetch("SOLARIS_ARCHIVE_INTERVAL", 60).to_i
+      Rails.application.config.x.intervals.archive
     end
 
     def last_archive

app/models/pvpc.rb

@@ -0,0 +1,18 @@
+class PVPC < ApplicationRecord
+  self.table_name = "pvpc"
+
+  validates :import, presence: true
+  validates :export, presence: true
+
+  scope :by_date, ->(date) { where(datetime: date.all_day).order(datetime: :asc) }
+
+  before_validation :set_factor, on: :create
+
+  private
+
+  def set_factor
+    return unless import.present? && export.present?
+
+    self.factor = [(import / export).round(2), 99].min
+  end
+end

app/lib/esios/indicator.rb → app/services/esios/indicator.rb

@@ -37,11 +37,11 @@ def perform_request(params = {})
     def parse_response(response)
       response = response.status.success? ? response.parse : {}
 
-      (response.dig("indicator", "values") || []).map do |value|
-        {
-          datetime: DateTime.parse(value["datetime"]),
-          value: (value["value"] / 1000.0).round(4)
-        }
+      (response.dig("indicator", "values") || []).to_h do |value|
+        [
+          DateTime.parse(value["datetime"]),
+          (value["value"] / 1000.0).round(4)
+        ]
       end
     end
   end

app/services/store_pvpc.rb

@@ -0,0 +1,34 @@
+class StorePVPC
+  def self.run(date = Date.current)
+    new(date).run
+  end
+
+  def initialize(date)
+    @date = date
+  end
+
+  def run
+    read[:import].each_pair do |datetime, value|
+      PVPC.find_or_create_by(datetime:) do |pvpc|
+        pvpc.import = value
+        pvpc.export = read[:export][datetime]
+      end
+    end
+
+    read
+  end
+
+  private
+
+  def read
+    @read ||= { import: import || {}, export: export || {} }
+  end
+
+  def import
+    ESIOS::Import.for_date(@date)
+  end
+
+  def export
+    ESIOS::Export.for_date(@date)
+  end
+end

config/application.rb

@@ -23,13 +23,11 @@ class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 7.1
 
-    # Configuration for the application, engines, and railties goes here.
-    #
-    # These settings can be overridden in specific environments using the files
-    # in config/environments, which are processed later.
-    #
-    # config.time_zone = "Central Time (US & Canada)"
-    # config.eager_load_paths << Rails.root.join("extras")
-    config.time_zone = ENV.fetch("SOLARIS_TIMEZONE", "Europe/Madrid").to_s
+    # Application Timezone
+    config.time_zone = ENV.fetch("TZ", "Europe/Madrid")
+
+    # Intervals
+    config.x.intervals.loop = ENV.fetch("SOLARIS_LOOP_INTERVAL", 30).to_i
+    config.x.intervals.archive = ENV.fetch("SOLARIS_ARCHIVE_INTERVAL", 300).to_i
   end
 end

config/initializers/inflections.rb

@@ -12,4 +12,5 @@
 
 ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym "ESIOS"
+  inflect.acronym "PVPC"
 end

config/scheduler.rb

@@ -0,0 +1,16 @@
+scheduler = Rufus::Scheduler.new
+loop_interval = Rails.application.config.x.intervals.loop
+
+scheduler.every loop_interval, name: "solaris.loop", first_at: Time.current.beginning_of_minute + 1.minute do
+  Solaris::Loop.run
+end
+
+scheduler.cron "0 21 * * * Europe/Madrid", name: "solaris.energy_price" do
+  StorePVPC.run(Date.tomorrow)
+end
+
+scheduler.cron "1 0 * * * #{Rails.application.config.time_zone}", name: "solaris.archive.daily" do
+  Solaris::DailyArchive.run
+end
+
+scheduler.join

db/migrate/20230805145711_create_pvpc.rb

@@ -0,0 +1,9 @@
+class CreatePVPC < ActiveRecord::Migration[7.1]
+  def change
+    create_table :pvpc, id: :datetime, primary_key: :datetime do |t|
+      t.decimal :import, precision: 8, scale: 6, null: false
+      t.decimal :export, precision: 8, scale: 6, null: false
+      t.decimal :factor, precision: 4, scale: 2, null: false
+    end
+  end
+end

db/migrate/20230805174919_create_archive.rb

@@ -1,6 +1,5 @@
 class CreateArchive < ActiveRecord::Migration[7.1]
   def change
-    # rubocop:disable Rails/CreateTableWithTimestamps
     create_table :archive, id: :datetime, primary_key: :created_at do |t|
       t.float :solar_power, null: false
       t.float :solar_energy, null: false

db/migrate/20230806183244_create_archive_daily_solar_power.rb

@@ -1,6 +1,5 @@
 class CreateArchiveDailySolarPower < ActiveRecord::Migration[7.1]
   def change
-    # rubocop:disable Rails/CreateTableWithTimestamps
     create_table :archive_daily_solar_power, id: :date, primary_key: :date do |t|
       t.float :max, null: false
       t.datetime :maxtime, null: false

db/migrate/20230807072241_create_archive_daily_solar_energy.rb

@@ -1,6 +1,5 @@
 class CreateArchiveDailySolarEnergy < ActiveRecord::Migration[7.1]
   def change
-    # rubocop:disable Rails/CreateTableWithTimestamps
     create_table :archive_daily_solar_energy, id: :date, primary_key: :date do |t|
       t.float :max, null: false
       t.datetime :maxtime, null: false

db/migrate/20230807181438_create_archive_daily_grid_power_export.rb

@@ -1,6 +1,5 @@
 class CreateArchiveDailyGridPowerExport < ActiveRecord::Migration[7.1]
   def change
-    # rubocop:disable Rails/CreateTableWithTimestamps
     create_table :archive_daily_grid_power_export, id: :date, primary_key: :date do |t|
       t.float :max, null: false
       t.datetime :maxtime

db/migrate/20230807181440_create_archive_daily_grid_power_import.rb

@@ -1,6 +1,5 @@
 class CreateArchiveDailyGridPowerImport < ActiveRecord::Migration[7.1]
   def change
-    # rubocop:disable Rails/CreateTableWithTimestamps
     create_table :archive_daily_grid_power_import, id: :date, primary_key: :date do |t|
       t.float :max, null: false
       t.datetime :maxtime

db/migrate/20230807181444_create_archive_daily_grid_energy_import.rb

@@ -1,6 +1,5 @@
 class CreateArchiveDailyGridEnergyImport < ActiveRecord::Migration[7.1]
   def change
-    # rubocop:disable Rails/CreateTableWithTimestamps
     create_table :archive_daily_grid_energy_import, id: :date, primary_key: :date do |t|
       t.float :max, null: false
       t.datetime :maxtime, null: false