v4.4.2

- Added Timezone to GraphQL scraper tests

japan_avg_hotel_price_finder/graphql_scraper.py

@@ -434,7 +434,7 @@ def check_info(
         try:
             currency_data = data['data']['searchQueries']['search']['results'][0]['blocks'][0]['finalPrice']['currency']
         except IndexError:
-            currency_data = entered_selected_currency
+            currency_data = data['data']['searchQueries']['search']['results'][1]['blocks'][0]['finalPrice']['currency']
 
         if entered_city != city_data:
             logger.error(f"Error City not match: {entered_city} != {city_data}")

tests/test_scrape.py

@@ -1,79 +1,79 @@
-# import datetime
-#
-# import pytest
-# import pytz
-#
-# from japan_avg_hotel_price_finder.scrape import create_df_from_scraped_data, BasicScraper
-# from set_details import Details
-#
-#
-# def test_create_df_from_scraped_data():
-#     check_in = "2024-06-01"
-#     check_out = "2024-06-05"
-#     city = "London"
-#     hotel_data_dict = {
-#         "Hotel": ["Hotel A", "Hotel B"],
-#         "Price": [100, 150],
-#         "Review": [4.5, 4.0]
-#     }
-#     df = create_df_from_scraped_data(check_in, check_out, city, hotel_data_dict)
-#     assert not df.empty
-#
-#     # Check row
-#     assert df.shape[0] == 2
-#
-#     # Check column
-#     assert df.shape[1] == 7
-#
-#     check_in = "2024-06-01"
-#     check_out = "2024-06-05"
-#     city = "London"
-#     hotel_data_dict = {}
-#     df = create_df_from_scraped_data(check_in, check_out, city, hotel_data_dict)
-#     assert df.empty
-#
-#     # Check row
-#     assert df.shape[0] == 0
-#
-#     # Check column
-#     assert df.shape[1] == 0
-#
-#
-# def test_scraper() -> None:
-#     city = 'Osaka'
-#     group_adults = 1
-#     num_rooms = 1
-#     group_children = 0
-#     selected_currency = 'USD'
-#
-#     # Define the timezone
-#     city_timezone = pytz.timezone('Asia/Singapore')
-#
-#     # Get the current date in the specified timezone
-#     today = datetime.datetime.now(city_timezone).date()
-#     month = today.month
-#     year = today.year
-#     check_in = datetime.date(year, month, 25).strftime('%Y-%m-%d')
-#     check_out = datetime.date(year, month, 25) + datetime.timedelta(days=1)
-#     check_out = check_out.strftime('%Y-%m-%d')
-#
-#     sqlite_name = 'test_scraper.db'
-#
-#     hotel_stay = Details(
-#         city=city, group_adults=group_adults, num_rooms=num_rooms,
-#         group_children=group_children, selected_currency=selected_currency,
-#         month=month, year=year, sqlite_name=sqlite_name
-#     )
-#
-#     scraper = BasicScraper(hotel_stay)
-#     data_tuple = scraper.start_scraping_process(check_in, check_out)
-#     df = data_tuple[0]
-#
-#     assert not df.empty
-#
-#     # Check column
-#     assert df.shape[1] == 7
-#
-#
-# if __name__ == '__main__':
-#     pytest.main()
+import datetime
+
+import pytest
+import pytz
+
+from japan_avg_hotel_price_finder.scrape import create_df_from_scraped_data, BasicScraper
+from set_details import Details
+
+
+def test_create_df_from_scraped_data():
+    check_in = "2024-06-01"
+    check_out = "2024-06-05"
+    city = "London"
+    hotel_data_dict = {
+        "Hotel": ["Hotel A", "Hotel B"],
+        "Price": [100, 150],
+        "Review": [4.5, 4.0]
+    }
+    df = create_df_from_scraped_data(check_in, check_out, city, hotel_data_dict)
+    assert not df.empty
+
+    # Check row
+    assert df.shape[0] == 2
+
+    # Check column
+    assert df.shape[1] == 7
+
+    check_in = "2024-06-01"
+    check_out = "2024-06-05"
+    city = "London"
+    hotel_data_dict = {}
+    df = create_df_from_scraped_data(check_in, check_out, city, hotel_data_dict)
+    assert df.empty
+
+    # Check row
+    assert df.shape[0] == 0
+
+    # Check column
+    assert df.shape[1] == 0
+
+
+def test_scraper() -> None:
+    city = 'Osaka'
+    group_adults = 1
+    num_rooms = 1
+    group_children = 0
+    selected_currency = 'USD'
+
+    # Define the timezone
+    city_timezone = pytz.timezone('Asia/Singapore')
+
+    # Get the current date in the specified timezone
+    today = datetime.datetime.now(city_timezone).date()
+    month = today.month
+    year = today.year
+    check_in = datetime.date(year, month, 25).strftime('%Y-%m-%d')
+    check_out = datetime.date(year, month, 25) + datetime.timedelta(days=1)
+    check_out = check_out.strftime('%Y-%m-%d')
+
+    sqlite_name = 'test_scraper.db'
+
+    hotel_stay = Details(
+        city=city, group_adults=group_adults, num_rooms=num_rooms,
+        group_children=group_children, selected_currency=selected_currency,
+        month=month, year=year, sqlite_name=sqlite_name
+    )
+
+    scraper = BasicScraper(hotel_stay)
+    data_tuple = scraper.start_scraping_process(check_in, check_out)
+    df = data_tuple[0]
+
+    assert not df.empty
+
+    # Check column
+    assert df.shape[1] == 7
+
+
+if __name__ == '__main__':
+    pytest.main()

tests/test_thread_scrape.py

@@ -1,77 +1,77 @@
-# import datetime
-# import pytest
-# import pytz
-#
-# from japan_avg_hotel_price_finder.thread_scrape import ThreadPoolScraper
-# from set_details import Details
-#
-#
-# def test_thread_scraper() -> None:
-#     city = 'Osaka'
-#     group_adults = 1
-#     num_rooms = 1
-#     group_children = 0
-#     selected_currency = 'USD'
-#
-#     # Define the timezone
-#     city_timezone = pytz.timezone('Asia/Singapore')
-#
-#     # Get the current date in the specified timezone
-#     today = datetime.datetime.now(city_timezone).date()
-#     start_day = 1
-#     month = today.month
-#     year = today.year
-#     nights = 1
-#
-#     sqlite_name = 'test_thread_scraper.db'
-#
-#     hotel_stay = Details(
-#         city=city, group_adults=group_adults, num_rooms=num_rooms,
-#         group_children=group_children, selected_currency=selected_currency,
-#         start_day=start_day, month=month, year=year, nights=nights, sqlite_name=sqlite_name
-#     )
-#
-#     thread_scrape = ThreadPoolScraper(hotel_stay)
-#     data_tuple = thread_scrape.thread_scrape(timezone=city_timezone, max_workers=5)
-#     df = data_tuple[0]
-#
-#     assert not df.empty
-#
-#     # Check column
-#     assert df.shape[1] == 7
-#
-#
-# def test_thread_scraper_past_month() -> None:
-#     city = 'Osaka'
-#     group_adults = 1
-#     num_rooms = 1
-#     group_children = 0
-#     selected_currency = 'USD'
-#
-#     # Define the timezone
-#     city_timezone = pytz.timezone('Asia/Singapore')
-#
-#     # Get the current date in the specified timezone
-#     today = datetime.datetime.now(city_timezone).date()
-#     start_day = 27
-#     month = today.month - 1
-#     year = today.year
-#     nights = 1
-#
-#     sqlite_name = 'test_thread_scraper_past_month.db'
-#
-#     hotel_stay = Details(
-#         city=city, group_adults=group_adults, num_rooms=num_rooms,
-#         group_children=group_children, selected_currency=selected_currency,
-#         start_day=start_day, month=month, year=year, nights=nights, sqlite_name=sqlite_name
-#     )
-#
-#     thread_scrape = ThreadPoolScraper(hotel_stay)
-#     data_tuple = thread_scrape.thread_scrape(timezone=city_timezone, max_workers=5)
-#     df = data_tuple[0]
-#
-#     assert df.empty
-#
-#
-# if __name__ == '__main__':
-#     pytest.main()
+import datetime
+import pytest
+import pytz
+
+from japan_avg_hotel_price_finder.thread_scrape import ThreadPoolScraper
+from set_details import Details
+
+
+def test_thread_scraper() -> None:
+    city = 'Osaka'
+    group_adults = 1
+    num_rooms = 1
+    group_children = 0
+    selected_currency = 'USD'
+
+    # Define the timezone
+    city_timezone = pytz.timezone('Asia/Singapore')
+
+    # Get the current date in the specified timezone
+    today = datetime.datetime.now(city_timezone).date()
+    start_day = 1
+    month = today.month
+    year = today.year
+    nights = 1
+
+    sqlite_name = 'test_thread_scraper.db'
+
+    hotel_stay = Details(
+        city=city, group_adults=group_adults, num_rooms=num_rooms,
+        group_children=group_children, selected_currency=selected_currency,
+        start_day=start_day, month=month, year=year, nights=nights, sqlite_name=sqlite_name
+    )
+
+    thread_scrape = ThreadPoolScraper(hotel_stay)
+    data_tuple = thread_scrape.thread_scrape(timezone=city_timezone, max_workers=5)
+    df = data_tuple[0]
+
+    assert not df.empty
+
+    # Check column
+    assert df.shape[1] == 7
+
+
+def test_thread_scraper_past_month() -> None:
+    city = 'Osaka'
+    group_adults = 1
+    num_rooms = 1
+    group_children = 0
+    selected_currency = 'USD'
+
+    # Define the timezone
+    city_timezone = pytz.timezone('Asia/Singapore')
+
+    # Get the current date in the specified timezone
+    today = datetime.datetime.now(city_timezone).date()
+    start_day = 27
+    month = today.month - 1
+    year = today.year
+    nights = 1
+
+    sqlite_name = 'test_thread_scraper_past_month.db'
+
+    hotel_stay = Details(
+        city=city, group_adults=group_adults, num_rooms=num_rooms,
+        group_children=group_children, selected_currency=selected_currency,
+        start_day=start_day, month=month, year=year, nights=nights, sqlite_name=sqlite_name
+    )
+
+    thread_scrape = ThreadPoolScraper(hotel_stay)
+    data_tuple = thread_scrape.thread_scrape(timezone=city_timezone, max_workers=5)
+    df = data_tuple[0]
+
+    assert df.empty
+
+
+if __name__ == '__main__':
+    pytest.main()