test fixed

Author: shubhvjain

codegreen_core/data/main.py

@@ -84,7 +84,7 @@ def energy(country, start_time, end_time, type="generation") -> dict:
                 if no, go online 
             """
             offline_data = off.get_offline_data(country,start_time,end_time)
-            if offline_data["available"] is True and offline_data["partial"] is False:
+            if offline_data["available"] is True and offline_data["partial"] is False and offline_data["data"] is not None:
                 # todo fix this if partial get remaining data and merge instead of fetching the complete data
                 return {"data":offline_data["data"],"data_available":True,"error":"None","time_interval":60,"message":"Data from offline source"}
             else:

tests/test_data.py

@@ -59,15 +59,15 @@ def test_entsoe_generation_data(self):
             #   "note":"this has issues,Hydro Pumped Storage values do not match "
             # },
             {
-                "country": "GR",
+                "country": "FI",
                 "start": datetime(2024, 3, 20),
                 "end": datetime(2024, 3, 24),
                 "dtype": "generation",
                 "file": "tests/data/generation_GR_24_downloaded.csv",
                 "interval60": True,
             },
             {
-                "country": "GR",
+                "country": "FR",
                 "start": datetime(2024, 1, 25),
                 "end": datetime(2024, 1, 28),
                 "dtype": "generation",
@@ -77,15 +77,15 @@ def test_entsoe_generation_data(self):
         ]
         for case in cases:
             # intervals = int((case["end"].replace(minute=0, second=0, microsecond=0) - case["start"].replace(minute=0, second=0, microsecond=0)).total_seconds() // 3600)
-            # print(intervals)
+            #print(case)
             if case["dtype"] == "generation":
                 d = energy(
                     case["country"],
                     case["start"],
                     case["end"],
-                    case["dtype"],
-                    case["interval60"],
+                    case["dtype"]
                 )
+                #print(d)
                 data = d["data"]
                 data_verify = pd.read_csv(case["file"])
                 data_verify["start_date"] = data_verify["MTU"].str.split(" - ").str[0]