fix url

LAMPSPUC · Oct 30, 2024 · ecb9f30 · ecb9f30
1 parent 6648cba
commit ecb9f30
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/src/caiso/urls.jl b/src/caiso/urls.jl
@@ -24,5 +24,6 @@ function _get_caiso_price_url(
     stopdate::AbstractString,
     market_run_id::AbstractString,
 )::AbstractString
-    return _get_caiso_url("PRC_INTVL_LMP", startdate, stopdate, market_run_id)
+    queryname = market_run_id == "RTM" ? "PRC_INTVL_LMP" : "PRC_LMP"
+    return _get_caiso_url(queryname, startdate, stopdate, market_run_id)
 end
diff --git a/src/caiso/utils.jl b/src/caiso/utils.jl
@@ -67,18 +67,16 @@ function _get_data(
     tasks = _async_get_raw_data(market, serie, start_date, end_date, folder)
     dfs = Vector{DataFrame}()
     for task in tasks
+        temp = nothing
         for file_name in _unzip(fetch(task), x -> serie * "_" * x)
             df = CSV.read(file_name, DataFrame)
-            push!(
-                dfs,
-                unstack(
-                    df,
-                    [:INTERVALSTARTTIME_GMT, :MARKET_RUN_ID, :NODE],
-                    :LMP_TYPE,
-                    :MW,
-                ),
-            )
+            pivot =
+                unstack(df, [:INTERVALSTARTTIME_GMT, :MARKET_RUN_ID, :NODE], :LMP_TYPE, :MW)
+            temp =
+                isnothing(temp) ? pivot :
+                outerjoin(temp, pivot, on = [:INTERVALSTARTTIME_GMT, :MARKET_RUN_ID, :NODE])
         end
+        push!(dfs, temp)
     end
     df = vcat(dfs...)
     rename!(

diff --git a/test/caiso/urls.jl b/test/caiso/urls.jl
@@ -21,4 +21,12 @@
         @test url ==
               "http://oasis.caiso.com/oasisapi/SingleZip?resultformat=6&queryname=PRC_INTVL_LMP&version=1&startdatetime=20230104T07:00-0000&enddatetime=20230105T07:00-0000&market_run_id=RTM"
     end
+    @testset "_get_caiso_price_url" begin
+        startdate = "20230104T07:00-0000"
+        stopdate = "20230105T07:00-0000"
+        market_run_id = "DAM"
+        url = ElectricityMarketData._get_caiso_price_url(startdate, stopdate, market_run_id)
+        @test url ==
+              "http://oasis.caiso.com/oasisapi/SingleZip?resultformat=6&queryname=PRC_LMP&version=1&startdatetime=20230104T07:00-0000&enddatetime=20230105T07:00-0000&market_run_id=DAM"
+    end
 end