WIP

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.8.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.0)
       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.8.2)
+      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: ruby config/scheduler.rb

app/lib/esios/export.rb

@@ -3,9 +3,5 @@ class Export < Indicator
     def url
       "https://api.esios.ree.es/indicators/1739"
     end
-
-    def geo_id
-      ENV.fetch("ESIOS_COUNTRY_GEO_ID", 3).to_i
-    end
   end
 end

app/lib/esios/import.rb

@@ -3,9 +3,5 @@ class Import < Indicator
     def url
       "https://api.esios.ree.es/indicators/1001"
     end
-
-    def geo_id
-      ENV.fetch("ESIOS_ZONE_GEO_ID", 8741).to_i
-    end
   end
 end

app/lib/esios/indicator.rb

@@ -2,18 +2,18 @@ module ESIOS
   class Indicator
     include MissingSingleton
 
-    def for_today
-      perform_request
-    end
-
-    def for_date(date)
+    def for_date(date, geo_id = nil)
       if date.is_a?(Range)
-        perform_request(
+        new(
           "start_date" => date.first.beginning_of_day.iso8601,
-          "end_date" => date.last.end_of_day.iso8601
+          "end_date" => date.last.end_of_day.iso8601,
+          "geo_ids[]" => geo_id,
         )
       else
-        perform_request("datetime" => date.iso8601)
+        perform_request(
+          "datetime" => date.iso8601,
+          "geo_ids[]" => geo_id,
+        )
       end
     end
 
@@ -23,15 +23,11 @@ def base_request
       HTTP
         .headers("Accept" => "application/json; application/vnd.esios-api-v2+json")
         .headers("Content-Type" => "application/json")
-        .headers("x-api-key" => ENV.fetch("ESIOS_API_KEY"))
-    end
-
-    def base_params
-      { "geo_ids[]" => geo_id }
+        .headers("x-api-key" => ENV.fetch("SOLARIS_ENERGY_PRICE_ESIOS_API_KEY"))
     end
 
     def perform_request(params = {})
-      parse_response(base_request.get(url, params: base_params.merge(params)))
+      parse_response(base_request.get(url, params: params.reject { |_, v| v.nil? }))
     end
 
     def parse_response(response)
@@ -40,7 +36,8 @@ def parse_response(response)
       (response.dig("indicator", "values") || []).map do |value|
         {
           datetime: DateTime.parse(value["datetime"]),
-          value: (value["value"] / 1000.0).round(4)
+          value: (value["value"] / 1000.0).round(4),
+          geo_id: value["geo_id"]
         }
       end
     end

app/models/energy_period.rb

@@ -0,0 +1,14 @@
+class EnergyPeriod < ApplicationRecord
+  belongs_to :zone
+
+  enum :day_type, %i[working_day weekend_holiday].to_enum_hash
+  enum :kind, %i[p1 p2 p3].to_enum_hash # P1 (Punta), P2 (Llano), P3 (Valle)
+
+  validates :start_hour, presence: true
+  validates :end_hour, presence: true
+
+  # TODO hay que tener en cuenta las zonas horarias de canarias
+  def self.kind_for(time, zone)
+
+  end
+end

app/models/holiday.rb

@@ -0,0 +1,4 @@
+class Holiday < ApplicationRecord
+  validates :name, presence: true
+  validates :date, presence: true, uniqueness: true
+end

app/models/pvpc.rb

@@ -0,0 +1,17 @@
+class PVPC < ApplicationRecord
+  belongs_to :zone
+
+  scope :by_date, ->(date) { where(time: date.all_day).order(time: :asc) }
+
+  def self.read(date, zone)
+    create!({ import: import(date, zone) || [], export: export(date, zone) || [] })
+  end
+
+  def self.import(date, zone)
+    ::ESIOS::Import.for_date(date, zone)
+  end
+
+  def self.export(date, zone)
+    ::ESIOS::Export.for_date(date, zone)
+  end
+end

app/models/zone.rb

@@ -0,0 +1,8 @@
+class Zone < ApplicationRecord
+  has_many :energy_periods, dependent: :destroy
+  has_many :pvpc, dependent: :destroy
+
+  validates :name, presence: true, uniqueness: true
+  validates :esios_import_geo_id, presence: true
+  validates :esios_export_geo_id, presence: true
+end

config/application.rb

@@ -30,6 +30,6 @@ class Application < Rails::Application
     #
     # 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
+    config.time_zone = "UTC"
   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,18 @@
+require_relative "environment"
+
+scheduler = Rufus::Scheduler.new
+loop_interval = ENV.fetch("SOLARIS_LOOP_INTERVAL", 30).to_i
+
+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_prices.esios_pvpc" do
+  Solaris::EnergyPrice.store(Date.tomorrow)
+end
+
+scheduler.cron "1 0 * * * #{tz}", name: "solaris.archive.daily" do
+  Solaris::DailyArchive.run
+end
+
+scheduler.join

db/migrate/20231220151918_create_inverters.rb

@@ -5,12 +5,11 @@ def change
       t.string :name, null: false
       t.references :protocol, null: false, foreign_key: true
       t.string :timezone, null: false
-      t.integer :loop_interval, null: false, default: 60
-      t.integer :archive_interval, null: false, default: 300
       t.string :brand
       t.string :model
       t.string :serial_number
       t.string :firmware_version
+      t.datetime :viewed_at
     end
   end
 end

db/migrate/20231224202745_create_zones.rb

@@ -0,0 +1,11 @@
+class CreateZones < ActiveRecord::Migration[7.1]
+  def change
+    create_table :zones do |t|
+      t.timestamps null: false
+      t.string :name, null: false
+      t.integer :esios_import_geo_id, null: false
+      t.integer :esios_export_geo_id, null: false
+      t.index :name, unique: true
+    end
+  end
+end

db/migrate/20231224203015_create_pvpc.rb

@@ -0,0 +1,11 @@
+class CreatePVPC < ActiveRecord::Migration[7.1]
+  def change
+    # rubocop:disable Rails/CreateTableWithTimestamps
+    create_table :pvpc, id: :time, primary_key: :time do |t|
+      t.references :zone, null: false, foreign_key: true
+      t.float :import, null: false
+      t.float :export, null: false
+    end
+    # rubocop:enable Rails/CreateTableWithTimestamps
+  end
+end

db/migrate/20231225224403_create_holidays.rb

@@ -0,0 +1,10 @@
+class CreateHolidays < ActiveRecord::Migration[7.1]
+  def change
+    create_table :holidays do |t|
+      t.timestamps null: false
+      t.string :name, null: false
+      t.date :date, null: false
+      t.index :date, unique: true
+    end
+  end
+end

db/migrate/20231226105540_create_energy_periods.rb

@@ -0,0 +1,12 @@
+class CreateEnergyPeriods < ActiveRecord::Migration[7.1]
+  def change
+    create_table :energy_periods do |t|
+      t.timestamps null: false
+      t.references :zone, null: false, foreign_key: true
+      t.string :day_type, null: false
+      t.integer :start_hour, null: false
+      t.integer :end_hour, null: false
+      t.string :kind, null: false
+    end
+  end
+end