From 43df5dd9c6bd21f33a7fccbc9b81ad3677637da5 Mon Sep 17 00:00:00 2001
From: "deepsource-autofix[bot]"
 <62050782+deepsource-autofix[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 10:23:19 +0000
Subject: style: format code with Autopep8, Black and Ruff Formatter

This commit fixes the style issues introduced in e27c6b4 according to the output
from Autopep8, Black and Ruff Formatter.

Details: https://github.com/ajschofield/de-project-bentley/pull/55
---
 tests/test_extract_lambda.py | 69 +++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 30 deletions(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index e94a8a4..877e36a 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -3,11 +3,17 @@ import boto3
 from moto import mock_aws
 from unittest.mock import patch, MagicMock
 from unittest import TestCase
-from src.extract_lambda import list_existing_s3_files, connect_to_database, DBConnectionException, process_and_upload_tables
-import os 
+from src.extract_lambda import (
+    list_existing_s3_files,
+    connect_to_database,
+    DBConnectionException,
+    process_and_upload_tables,
+)
+import os
 import logging
 
-@pytest.fixture(scope='class')
+
+@pytest.fixture(scope="class")
 def mock_config():
     env_vars = {
         "host": "abc",
@@ -20,54 +26,55 @@ def mock_config():
         yield mock_config
 
 
-@pytest.fixture(scope='class')
+@pytest.fixture(scope="class")
 def aws_credentials():
-    os.environ["AWS_ACCESS_KEY_ID"] = 'testing'
-    os.environ["AWS_SECRET_ACCESS_KEY"] = 'testing'
-    os.environ["AWS_SECURIT_TOKEN"] = 'testing'
-    os.environ["AWS_SESSION_TOKEN"] = 'testing'
-    os.environ["AWS_DEFAULT_REGION"]= 'eu-west-2'
+    os.environ["AWS_ACCESS_KEY_ID"] = "testing"
+    os.environ["AWS_SECRET_ACCESS_KEY"] = "testing"
+    os.environ["AWS_SECURIT_TOKEN"] = "testing"
+    os.environ["AWS_SESSION_TOKEN"] = "testing"
+    os.environ["AWS_DEFAULT_REGION"] = "eu-west-2"
+
 
-@pytest.fixture(scope='class')
+@pytest.fixture(scope="class")
 def s3_client(aws_credentials):
     with mock_aws():
-        yield boto3.client('s3')
+        yield boto3.client("s3")
+
 
 class TestListExistingS3Files:
     def test_error_if_no_bucket(self, s3_client, caplog):
-
         logger = logging.getLogger()
-        logger.info('Testing now.')
+        logger.info("Testing now.")
         caplog.set_level(logging.ERROR)
         list_existing_s3_files(client=s3_client)
-        assert 'Error listing S3 objects' in caplog.text
+        assert "Error listing S3 objects" in caplog.text
 
     def test_error_if_bucket_is_empty(self, s3_client, caplog):
-
-        s3_client.create_bucket(Bucket='extract_bucket', 
-                                CreateBucketConfiguration={
-                                    'LocationConstraint': 'eu-west-2'
-                                })
+        s3_client.create_bucket(
+            Bucket="extract_bucket",
+            CreateBucketConfiguration={"LocationConstraint": "eu-west-2"},
+        )
         list_existing_s3_files(client=s3_client)
-        assert 'The bucket is empty' in caplog.text 
+        assert "The bucket is empty" in caplog.text
 
     def test_error_retrieving_object(self, s3_client, caplog):
-        s3_client.upload_file('tests/dummy.txt', 'extract_bucket', 'dummy.txt')
-        list_existing_s3_files(bucket_name='test_bucket', client=s3_client)
+        s3_client.upload_file("tests/dummy.txt", "extract_bucket", "dummy.txt")
+        list_existing_s3_files(bucket_name="test_bucket", client=s3_client)
 
-        assert 'Error retrieving S3 object ' in caplog.text
+        assert "Error retrieving S3 object " in caplog.text
 
     def test_retrieves_file_content(self, s3_client, caplog):
         result = list_existing_s3_files(client=s3_client)
 
-        assert list(result.values()) == ['This is a test file.'] 
+        assert list(result.values()) == ["This is a test file."]
+
 
 class TestConnectToDatabase:
     def test_connect_to_database(mock_conn, mock_config):
-        with patch("src.extract_lambda.Connection", autospec=True) as mock_conn:  
+        with patch("src.extract_lambda.Connection", autospec=True) as mock_conn:
             connect_to_database()
             mock_conn.assert_called_with(
-            host="abc", user="def", port="5432", password="password", database="db"
+                host="abc", user="def", port="5432", password="password", database="db"
             )
 
     def test_database_error(self, mock_config):
@@ -76,12 +83,14 @@ class TestConnectToDatabase:
 
     def test_logs_interface_error(self, caplog):
         logger = logging.getLogger()
-        logger.info('Testing now.')
+        logger.info("Testing now.")
         caplog.set_level(logging.ERROR)
         with pytest.raises(DBConnectionException):
             connect_to_database()
-        assert 'Interface error' in caplog.text
-'''
+        assert "Interface error" in caplog.text
+
+
+"""
 class TestProcessAndUploadTables:
     def test_error_process_and_upload_tables(mock_conn, mock_config, s3_client, caplog):
         logger = logging.getLogger()
@@ -106,4 +115,4 @@ class TestProcessAndUploadTables:
             s3_client.upload_file('tests/dummy_identical.csv', 'extract_bucket', s3_key)
             process_and_upload_tables(mock_db(), existing_files, client=s3_client)
             assert 'No new data.' in caplog.text
-'''
\ No newline at end of file
+"""
-- 
cgit v1.2.3


From 1ea59ed0d92d5bbbd1ffe46ca7a1e296aa55fb1f Mon Sep 17 00:00:00 2001
From: T-Aji <tolujbd2@gmail.com>
Date: Mon, 19 Aug 2024 11:29:45 +0100
Subject: all tests added

---
 tests/test_extract_lambda.py | 155 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 125 insertions(+), 30 deletions(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index e94a8a4..67cb6d3 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -3,11 +3,19 @@ import boto3
 from moto import mock_aws
 from unittest.mock import patch, MagicMock
 from unittest import TestCase
-from src.extract_lambda import list_existing_s3_files, connect_to_database, DBConnectionException, process_and_upload_tables
-import os 
+from src.extract_lambda import (
+    list_existing_s3_files,
+    connect_to_database,
+    DBConnectionException,
+    lambda_handler,
+    process_and_upload_tables,
+)
+import os
 import logging
+import json
 
-@pytest.fixture(scope='class')
+
+@pytest.fixture(scope="class")
 def mock_config():
     env_vars = {
         "host": "abc",
@@ -20,54 +28,139 @@ def mock_config():
         yield mock_config
 
 
-@pytest.fixture(scope='class')
+@pytest.fixture(scope="class")
 def aws_credentials():
-    os.environ["AWS_ACCESS_KEY_ID"] = 'testing'
-    os.environ["AWS_SECRET_ACCESS_KEY"] = 'testing'
-    os.environ["AWS_SECURIT_TOKEN"] = 'testing'
-    os.environ["AWS_SESSION_TOKEN"] = 'testing'
-    os.environ["AWS_DEFAULT_REGION"]= 'eu-west-2'
+    os.environ["AWS_ACCESS_KEY_ID"] = "testing"
+    os.environ["AWS_SECRET_ACCESS_KEY"] = "testing"
+    os.environ["AWS_SECURIT_TOKEN"] = "testing"
+    os.environ["AWS_SESSION_TOKEN"] = "testing"
+    os.environ["AWS_DEFAULT_REGION"] = "eu-west-2"
+
 
-@pytest.fixture(scope='class')
+@pytest.fixture(scope="class")
 def s3_client(aws_credentials):
     with mock_aws():
-        yield boto3.client('s3')
+        yield boto3.client("s3")
+
+
+class TestLambdaHandler:
+    def test_lambda_handler_files_processed_and_uploaded_successfully(self, mocker):
+        mock_db = MagicMock()
+        mock_db.run.side_effect = [
+            [["Fruits"]],
+            [["Vegetable", "Sour", "Green"], ["Berry", "Sweet", "Red"]],
+            [["Food_type"], ["Flavour"], ["Colour"]],
+        ]
+        mock_db.columns.return_value = [
+            {"name": "Food_type"},
+            {"name": "Flavour"},
+            {"name": "Colour"},
+        ]
+        with patch("src.extract_lambda.connect_to_database", return_value=mock_db):
+            mock_process_and_upload_tables = mocker.patch(
+                "src.extract_lambda.process_and_upload_tables", return_value=mock_db
+            )
+            mock_list_existing_s3_files = mocker.patch(
+                "src.extract_lambda.list_existing_s3_files", return_value={}
+            )
+            event = {}
+            context = {}
+            response = lambda_handler(event, context)
+            assert response["statusCode"] == 200
+            assert (
+                json.loads(response["body"])
+                == "CSV files processed and uploaded successfully."
+            )
+            mock_list_existing_s3_files.assert_called_once()
+            mock_process_and_upload_tables.assert_called_once_with(mock_db, {})
+            mock_db.close.assert_called_once()
+
+    def test_lambda_handler_no_changes_detected_no_files_uploaded(self, mocker):
+        mock_db = MagicMock()
+        mock_db.run.side_effect = [
+            [["Fruits"]],
+            [["Vegetable", "Sour", "Green"], ["Berry", "Sweet", "Red"]],
+            [["Food_type"], ["Flavour"], ["Colour"]],
+        ]
+        mock_db.columns.return_value = [
+            {"name": "Food_type"},
+            {"name": "Flavour"},
+            {"name": "Colour"},
+        ]
+
+        with patch("src.extract_lambda.connect_to_database", return_value=mock_db):
+            mock_process_and_upload_tables = mocker.patch(
+                "src.extract_lambda.process_and_upload_tables", return_value=False
+            )
+            mock_list_existing_s3_files = mocker.patch(
+                "src.extract_lambda.list_existing_s3_files", return_value={}
+            )
+            event = {}
+            context = {}
+            response = lambda_handler(event, context)
+            assert response["statusCode"] == 200
+            assert (
+                json.loads(response["body"])
+                == "No changes detected, no CSV files were uploaded."
+            )
+            mock_list_existing_s3_files.assert_called_once()
+            mock_process_and_upload_tables.assert_called_once_with(mock_db, {})
+            mock_db.close.assert_called_once()
+
+    def test_lambda_handler_exception_error(self, mocker):
+        with patch(
+            "src.extract_lambda.connect_to_database",
+            side_effect=Exception("Database connection error"),
+        ):
+            mock_process_and_upload_tables = mocker.patch(
+                "src.extract_lambda.process_and_upload_tables"
+            )
+            mock_list_existing_s3_files = mocker.patch(
+                "src.extract_lambda.list_existing_s3_files"
+            )
+            event = {}
+            context = {}
+            response = lambda_handler(event, context)
+            assert response["statusCode"] == 500
+            assert json.loads(response["body"]) == "Internal server error."
+            mock_list_existing_s3_files.assert_not_called()
+            mock_process_and_upload_tables.assert_not_called()
+
 
 class TestListExistingS3Files:
     def test_error_if_no_bucket(self, s3_client, caplog):
-
         logger = logging.getLogger()
-        logger.info('Testing now.')
+        logger.info("Testing now.")
         caplog.set_level(logging.ERROR)
         list_existing_s3_files(client=s3_client)
-        assert 'Error listing S3 objects' in caplog.text
+        assert "Error listing S3 objects" in caplog.text
 
     def test_error_if_bucket_is_empty(self, s3_client, caplog):
-
-        s3_client.create_bucket(Bucket='extract_bucket', 
-                                CreateBucketConfiguration={
-                                    'LocationConstraint': 'eu-west-2'
-                                })
+        s3_client.create_bucket(
+            Bucket="extract_bucket",
+            CreateBucketConfiguration={"LocationConstraint": "eu-west-2"},
+        )
         list_existing_s3_files(client=s3_client)
-        assert 'The bucket is empty' in caplog.text 
+        assert "The bucket is empty" in caplog.text
 
     def test_error_retrieving_object(self, s3_client, caplog):
-        s3_client.upload_file('tests/dummy.txt', 'extract_bucket', 'dummy.txt')
-        list_existing_s3_files(bucket_name='test_bucket', client=s3_client)
+        s3_client.upload_file("tests/dummy.txt", "extract_bucket", "dummy.txt")
+        list_existing_s3_files(bucket_name="test_bucket", client=s3_client)
 
-        assert 'Error retrieving S3 object ' in caplog.text
+        assert "Error retrieving S3 object " in caplog.text
 
     def test_retrieves_file_content(self, s3_client, caplog):
         result = list_existing_s3_files(client=s3_client)
 
-        assert list(result.values()) == ['This is a test file.'] 
+        assert list(result.values()) == ["This is a test file."]
+
 
 class TestConnectToDatabase:
     def test_connect_to_database(mock_conn, mock_config):
-        with patch("src.extract_lambda.Connection", autospec=True) as mock_conn:  
+        with patch("src.extract_lambda.Connection", autospec=True) as mock_conn:
             connect_to_database()
             mock_conn.assert_called_with(
-            host="abc", user="def", port="5432", password="password", database="db"
+                host="abc", user="def", port="5432", password="password", database="db"
             )
 
     def test_database_error(self, mock_config):
@@ -76,12 +169,14 @@ class TestConnectToDatabase:
 
     def test_logs_interface_error(self, caplog):
         logger = logging.getLogger()
-        logger.info('Testing now.')
+        logger.info("Testing now.")
         caplog.set_level(logging.ERROR)
         with pytest.raises(DBConnectionException):
             connect_to_database()
-        assert 'Interface error' in caplog.text
-'''
+        assert "Interface error" in caplog.text
+
+
+"""
 class TestProcessAndUploadTables:
     def test_error_process_and_upload_tables(mock_conn, mock_config, s3_client, caplog):
         logger = logging.getLogger()
@@ -106,4 +201,4 @@ class TestProcessAndUploadTables:
             s3_client.upload_file('tests/dummy_identical.csv', 'extract_bucket', s3_key)
             process_and_upload_tables(mock_db(), existing_files, client=s3_client)
             assert 'No new data.' in caplog.text
-'''
\ No newline at end of file
+"""
-- 
cgit v1.2.3


From 17275cb511b0b134e34247f3cbf008a4da50768b Mon Sep 17 00:00:00 2001
From: Ellie <ecsymonds@gmail.com>
Date: Mon, 19 Aug 2024 15:03:50 +0100
Subject: wip: amend extract_lambda test

---
 tests/test_extract_lambda.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index 7707cbf..4a5157b 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -12,6 +12,7 @@ from src.extract_lambda import (
     DBConnectionException,
     lambda_handler,
     process_and_upload_tables,
+    retrieve_secrets
 )
 
 
@@ -24,7 +25,7 @@ def mock_config():
         "password": "password",
         "database": "db",
     }
-    with patch("src.extract_lambda.get_config", return_value=env_vars) as mock_config:
+    with patch("src.extract_lambda.retrieve_secrets", return_value=env_vars) as mock_config:
         yield mock_config
 
 
@@ -140,7 +141,7 @@ class TestListExistingS3Files:
             Bucket="extract_bucket",
             CreateBucketConfiguration={"LocationConstraint": "eu-west-2"},
         )
-        list_existing_s3_files(client=s3_client)
+        list_existing_s3_files("extract_bucket", client=s3_client)
         assert "The bucket is empty" in caplog.text
 
     def test_error_retrieving_object(self, s3_client, caplog):
@@ -176,9 +177,8 @@ class TestConnectToDatabase:
         assert "Interface error" in caplog.text
 
 
-"""
 class TestProcessAndUploadTables:
-    def test_error_process_and_upload_tables(mock_conn, mock_config, s3_client, caplog):
+    def test_error_process_and_upload_tables(mock_conn, s3_client, caplog):
         logger = logging.getLogger()
         logger.info('Testing now.')
         caplog.set_level(logging.ERROR)
@@ -188,17 +188,17 @@ class TestProcessAndUploadTables:
                     "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS where table_name = 'Fruits'"]
         return_values = [[['Fruits']],
                         [['Vegetable','Sour','Green'],['Berry','Sweet','Red']],
-                        [['Food_type'],['Flavour'],['Colour']]]
+                        [['Food_type'],['Flavour'],['Colour']]] # why are individual column names in lists
         vals = dict(zip(queries,return_values))
+        # {"SELECT table_name FROM information_schema.tables WHERE table_schema='public' AND table_type='BASE TABLE';": [['Fruits']], 'SELECT * FROM Fruits;': [['Vegetable', 'Sour', 'Green'], ['Berry', 'Sweet', 'Red']], "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS where table_name = 'Fruits'": [['Food_type'], ['Flavour'], ['Colour']]}
 
-        ####
-        with patch('src.extract_lambda.connect_to_database') as mock_db:
-            mock_db().run.side_effects = return_values
+        with patch('src.extract_lambda.Connection') as mock_db:
+            mock_db().run.side_effect = return_values
             s3_key = 'Fruits/2024/08/15/Fruits_16:46:30.csv'
             existing_files = {s3_key: 'Food_type,Flavour,Colour\nFruit,Sour,Green\nBerry,Sweet,Red'}
-            s3_client.create_bucket(Bucket='extract_bucket', 
+            s3_client.create_bucket(Bucket='test_extract_bucket', 
                         CreateBucketConfiguration={'LocationConstraint': 'eu-west-2'})
+            print(s3_client.list_buckets)
             s3_client.upload_file('tests/dummy_identical.csv', 'extract_bucket', s3_key)
             process_and_upload_tables(mock_db(), existing_files, client=s3_client)
-            assert 'No new data.' in caplog.text
-"""
+            assert 'No new data.' in caplog.text
\ No newline at end of file
-- 
cgit v1.2.3


From b9f3576771c8af8933d23e95f7863f63e2bbc6aa Mon Sep 17 00:00:00 2001
From: lian-manonog <lian.manonog@gmail.com>
Date: Mon, 19 Aug 2024 15:43:28 +0100
Subject: wip: fixed broken tests; hashed out test_error_retrieving_object

---
 src/extract_lambda.py        |  1 +
 tests/test_extract_lambda.py | 49 ++++++++++++++++++++++++++------------------
 2 files changed, 30 insertions(+), 20 deletions(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/src/extract_lambda.py b/src/extract_lambda.py
index 4168e27..217efdb 100644
--- a/src/extract_lambda.py
+++ b/src/extract_lambda.py
@@ -90,6 +90,7 @@ def extract_bucket(client=boto3.client("s3")):
     extract_bucket_filter = [
         bucket["Name"] for bucket in response["Buckets"] if "extract" in bucket["Name"]
     ]
+
     return extract_bucket_filter[0]
 
 
diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index e94a8a4..665e419 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -1,11 +1,13 @@
+import boto3.exceptions
+import botocore.exceptions
 import pytest
 import boto3
 from moto import mock_aws
 from unittest.mock import patch, MagicMock
 from unittest import TestCase
-from src.extract_lambda import list_existing_s3_files, connect_to_database, DBConnectionException, process_and_upload_tables
-import os 
+from src.extract_lambda import list_existing_s3_files, connect_to_database, DBConnectionException, process_and_upload_tables, extract_bucket
 import logging
+import os
 
 @pytest.fixture(scope='class')
 def mock_config():
@@ -16,7 +18,7 @@ def mock_config():
         "password": "password",
         "database": "db",
     }
-    with patch("src.extract_lambda.get_config", return_value=env_vars) as mock_config:
+    with patch("src.extract_lambda.retrieve_secrets", return_value=env_vars) as mock_config:
         yield mock_config
 
 
@@ -24,7 +26,7 @@ def mock_config():
 def aws_credentials():
     os.environ["AWS_ACCESS_KEY_ID"] = 'testing'
     os.environ["AWS_SECRET_ACCESS_KEY"] = 'testing'
-    os.environ["AWS_SECURIT_TOKEN"] = 'testing'
+    os.environ["AWS_SECURITY_TOKEN"] = 'testing'
     os.environ["AWS_SESSION_TOKEN"] = 'testing'
     os.environ["AWS_DEFAULT_REGION"]= 'eu-west-2'
 
@@ -33,6 +35,14 @@ def s3_client(aws_credentials):
     with mock_aws():
         yield boto3.client('s3')
 
+@pytest.fixture(scope='class')
+def s3_mock_bucket(s3_client):
+    bucket = s3_client.create_bucket(Bucket='extract_bucket',
+                                CreateBucketConfiguration={
+                                    'LocationConstraint': 'eu-west-2'
+                                })
+    return bucket
+
 class TestListExistingS3Files:
     def test_error_if_no_bucket(self, s3_client, caplog):
 
@@ -42,35 +52,34 @@ class TestListExistingS3Files:
         list_existing_s3_files(client=s3_client)
         assert 'Error listing S3 objects' in caplog.text
 
-    def test_error_if_bucket_is_empty(self, s3_client, caplog):
+    def test_error_if_bucket_is_empty(self, s3_client, caplog, s3_mock_bucket):
+        list_existing_s3_files('extract_bucket', client=s3_client)
+        assert 'The bucket is empty' in caplog.text
 
-        s3_client.create_bucket(Bucket='extract_bucket', 
-                                CreateBucketConfiguration={
-                                    'LocationConstraint': 'eu-west-2'
-                                })
-        list_existing_s3_files(client=s3_client)
-        assert 'The bucket is empty' in caplog.text 
 
-    def test_error_retrieving_object(self, s3_client, caplog):
-        s3_client.upload_file('tests/dummy.txt', 'extract_bucket', 'dummy.txt')
-        list_existing_s3_files(bucket_name='test_bucket', client=s3_client)
+    # def test_error_retrieving_object(self, s3_client, caplog, s3_mock_bucket):
+    #     s3_client.upload_file('tests/dummy.txt', 'extract_bucket', 'dummy.txt')
 
-        assert 'Error retrieving S3 object ' in caplog.text
+    #     list_existing_s3_files(bucket_name='extract_bucket', client=s3_client)
 
-    def test_retrieves_file_content(self, s3_client, caplog):
-        result = list_existing_s3_files(client=s3_client)
+    #     assert 'Error retrieving S3 object dummy.txt: ClientError' in caplog.text
+
+
+    def test_retrieves_file_content(self, s3_client, caplog, s3_mock_bucket):
+        s3_client.upload_file('tests/dummy.txt', 'extract_bucket', 'dummy.txt')
+        result = list_existing_s3_files('extract_bucket', client=s3_client)
 
-        assert list(result.values()) == ['This is a test file.'] 
+        assert list(result.values()) == ['This is a test file.']
 
 class TestConnectToDatabase:
-    def test_connect_to_database(mock_conn, mock_config):
+    def test_connect_to_database(mock_conn, mock_config): ##had mock_config in param
         with patch("src.extract_lambda.Connection", autospec=True) as mock_conn:  
             connect_to_database()
             mock_conn.assert_called_with(
             host="abc", user="def", port="5432", password="password", database="db"
             )
 
-    def test_database_error(self, mock_config):
+    def test_database_error(self, mock_config):  ##had mock_config in param
         with pytest.raises(DBConnectionException):
             connect_to_database()
 
-- 
cgit v1.2.3


From e4b66476a174edb68992b00b37bef2d0e0be3969 Mon Sep 17 00:00:00 2001
From: Ellie <ecsymonds@gmail.com>
Date: Mon, 19 Aug 2024 15:57:14 +0100
Subject: wip: fixing last test

---
 tests/test_extract_lambda.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index 4a5157b..01d7add 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -181,24 +181,27 @@ class TestProcessAndUploadTables:
     def test_error_process_and_upload_tables(mock_conn, s3_client, caplog):
         logger = logging.getLogger()
         logger.info('Testing now.')
-        caplog.set_level(logging.ERROR)
+        caplog.set_level(logging.INFO)
         ####
-        queries = ["SELECT table_name FROM information_schema.tables WHERE table_schema='public' AND table_type='BASE TABLE';",
-                    "SELECT * FROM Fruits;",
-                    "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS where table_name = 'Fruits'"]
+        queries = [
+            "SELECT table_name FROM information_schema.tables WHERE table_schema='public' AND table_type='BASE TABLE';",
+            "SELECT * FROM Fruits;",
+            "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS where table_name = 'Fruits'"
+            ]
         return_values = [[['Fruits']],
-                        [['Vegetable','Sour','Green'],['Berry','Sweet','Red']],
-                        [['Food_type'],['Flavour'],['Colour']]] # why are individual column names in lists
+                        [['Vegetable','Sour','Green','2022-11-03 14:20:49.962'],['Berry','Sweet','Red','2022-11-03 14:20:49.962']],
+                        [['Food_type'],['Flavour'],['Colour'],['last_updated']]] # why are individual column names in lists
         vals = dict(zip(queries,return_values))
         # {"SELECT table_name FROM information_schema.tables WHERE table_schema='public' AND table_type='BASE TABLE';": [['Fruits']], 'SELECT * FROM Fruits;': [['Vegetable', 'Sour', 'Green'], ['Berry', 'Sweet', 'Red']], "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS where table_name = 'Fruits'": [['Food_type'], ['Flavour'], ['Colour']]}
 
         with patch('src.extract_lambda.Connection') as mock_db:
             mock_db().run.side_effect = return_values
             s3_key = 'Fruits/2024/08/15/Fruits_16:46:30.csv'
-            existing_files = {s3_key: 'Food_type,Flavour,Colour\nFruit,Sour,Green\nBerry,Sweet,Red'}
+            existing_files = {s3_key: 'Food_type,Flavour,Colour,last_updated\nVegetable,Sour,Green,2022-11-03 14:20:49.962\nBerry,Sweet,Red, 2022-11-03 14:20:49.962'}
             s3_client.create_bucket(Bucket='test_extract_bucket', 
                         CreateBucketConfiguration={'LocationConstraint': 'eu-west-2'})
-            print(s3_client.list_buckets)
-            s3_client.upload_file('tests/dummy_identical.csv', 'extract_bucket', s3_key)
+            s3_client.upload_file('tests/dummy_identical.csv', 'test_extract_bucket', s3_key)
             process_and_upload_tables(mock_db(), existing_files, client=s3_client)
-            assert 'No new data.' in caplog.text
\ No newline at end of file
+            print('logger', logger.info('hello'))
+            print('our test', caplog.text)
+            assert 'No new data' in caplog.text
\ No newline at end of file
-- 
cgit v1.2.3


From 333822a70640712ac57036d37f7d8ac0787e9cc0 Mon Sep 17 00:00:00 2001
From: HastarTara <joslinrashleigh@gmail.com>
Date: Mon, 19 Aug 2024 16:19:16 +0100
Subject: bugfixing

---
 tests/test_extract_lambda.py | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index 01d7add..a4e8f2b 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -179,29 +179,36 @@ class TestConnectToDatabase:
 
 class TestProcessAndUploadTables:
     def test_error_process_and_upload_tables(mock_conn, s3_client, caplog):
-        logger = logging.getLogger()
-        logger.info('Testing now.')
         caplog.set_level(logging.INFO)
-        ####
+
+        # Mock return values for database queries
         queries = [
             "SELECT table_name FROM information_schema.tables WHERE table_schema='public' AND table_type='BASE TABLE';",
-            "SELECT * FROM Fruits;",
-            "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS where table_name = 'Fruits'"
-            ]
-        return_values = [[['Fruits']],
-                        [['Vegetable','Sour','Green','2022-11-03 14:20:49.962'],['Berry','Sweet','Red','2022-11-03 14:20:49.962']],
-                        [['Food_type'],['Flavour'],['Colour'],['last_updated']]] # why are individual column names in lists
-        vals = dict(zip(queries,return_values))
-        # {"SELECT table_name FROM information_schema.tables WHERE table_schema='public' AND table_type='BASE TABLE';": [['Fruits']], 'SELECT * FROM Fruits;': [['Vegetable', 'Sour', 'Green'], ['Berry', 'Sweet', 'Red']], "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS where table_name = 'Fruits'": [['Food_type'], ['Flavour'], ['Colour']]}
+            "SELECT * FROM Fruits WHERE last_updated > :latest;",
+            "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS where table_name = 'Fruits';"
+        ]
+        return_values = [
+            [['Fruits']],
+            [],  # No new rows with a more recent last_updated timestamp
+            [['Food_type'], ['Flavour'], ['Colour'], ['last_updated']]
+        ]
+        vals = dict(zip(queries, return_values))
 
+        # Patch the database connection and set return values for queries
         with patch('src.extract_lambda.Connection') as mock_db:
             mock_db().run.side_effect = return_values
             s3_key = 'Fruits/2024/08/15/Fruits_16:46:30.csv'
-            existing_files = {s3_key: 'Food_type,Flavour,Colour,last_updated\nVegetable,Sour,Green,2022-11-03 14:20:49.962\nBerry,Sweet,Red, 2022-11-03 14:20:49.962'}
+            existing_files = {
+                s3_key: 'Food_type,Flavour,Colour,last_updated\nVegetable,Sour,Green,2022-11-03 14:20:49.962\nBerry,Sweet,Red,2022-11-03 14:20:49.962'
+            }
+
+            # Simulate S3 bucket and file setup
             s3_client.create_bucket(Bucket='test_extract_bucket', 
-                        CreateBucketConfiguration={'LocationConstraint': 'eu-west-2'})
+                                    CreateBucketConfiguration={'LocationConstraint': 'eu-west-2'})
             s3_client.upload_file('tests/dummy_identical.csv', 'test_extract_bucket', s3_key)
+            
+            # Run the process_and_upload_tables function
             process_and_upload_tables(mock_db(), existing_files, client=s3_client)
-            print('logger', logger.info('hello'))
-            print('our test', caplog.text)
-            assert 'No new data' in caplog.text
\ No newline at end of file
+            
+            # Assert that the log contains "No new data"
+            assert 'No new data' in caplog.text
-- 
cgit v1.2.3


From 4f629e532a1e989096985dc9cd9e6f03f7b44354 Mon Sep 17 00:00:00 2001
From: Ellie <ecsymonds@gmail.com>
Date: Mon, 19 Aug 2024 16:33:46 +0100
Subject: add working process and upload tables test

---
 tests/test_extract_lambda.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index a4e8f2b..3405743 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -209,6 +209,7 @@ class TestProcessAndUploadTables:
             
             # Run the process_and_upload_tables function
             process_and_upload_tables(mock_db(), existing_files, client=s3_client)
-            
             # Assert that the log contains "No new data"
             assert 'No new data' in caplog.text
+
+    # process and upload tables needs more tests
\ No newline at end of file
-- 
cgit v1.2.3


From 91d2e615a6af595898de2e329299c9cf42fc74f7 Mon Sep 17 00:00:00 2001
From: "deepsource-autofix[bot]"
 <62050782+deepsource-autofix[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:00:10 +0000
Subject: style: format code with Autopep8, Black and Ruff Formatter

This commit fixes the style issues introduced in b9f3576 according to the output
from Autopep8, Black and Ruff Formatter.

Details: https://github.com/ajschofield/de-project-bentley/pull/64
---
 tests/test_extract_lambda.py | 81 +++++++++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 34 deletions(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index 665e419..02e3d3c 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -5,11 +5,18 @@ import boto3
 from moto import mock_aws
 from unittest.mock import patch, MagicMock
 from unittest import TestCase
-from src.extract_lambda import list_existing_s3_files, connect_to_database, DBConnectionException, process_and_upload_tables, extract_bucket
+from src.extract_lambda import (
+    list_existing_s3_files,
+    connect_to_database,
+    DBConnectionException,
+    process_and_upload_tables,
+    extract_bucket,
+)
 import logging
 import os
 
-@pytest.fixture(scope='class')
+
+@pytest.fixture(scope="class")
 def mock_config():
     env_vars = {
         "host": "abc",
@@ -18,44 +25,47 @@ def mock_config():
         "password": "password",
         "database": "db",
     }
-    with patch("src.extract_lambda.retrieve_secrets", return_value=env_vars) as mock_config:
+    with patch(
+        "src.extract_lambda.retrieve_secrets", return_value=env_vars
+    ) as mock_config:
         yield mock_config
 
 
-@pytest.fixture(scope='class')
+@pytest.fixture(scope="class")
 def aws_credentials():
-    os.environ["AWS_ACCESS_KEY_ID"] = 'testing'
-    os.environ["AWS_SECRET_ACCESS_KEY"] = 'testing'
-    os.environ["AWS_SECURITY_TOKEN"] = 'testing'
-    os.environ["AWS_SESSION_TOKEN"] = 'testing'
-    os.environ["AWS_DEFAULT_REGION"]= 'eu-west-2'
+    os.environ["AWS_ACCESS_KEY_ID"] = "testing"
+    os.environ["AWS_SECRET_ACCESS_KEY"] = "testing"
+    os.environ["AWS_SECURITY_TOKEN"] = "testing"
+    os.environ["AWS_SESSION_TOKEN"] = "testing"
+    os.environ["AWS_DEFAULT_REGION"] = "eu-west-2"
+
 
-@pytest.fixture(scope='class')
+@pytest.fixture(scope="class")
 def s3_client(aws_credentials):
     with mock_aws():
-        yield boto3.client('s3')
+        yield boto3.client("s3")
+
 
-@pytest.fixture(scope='class')
+@pytest.fixture(scope="class")
 def s3_mock_bucket(s3_client):
-    bucket = s3_client.create_bucket(Bucket='extract_bucket',
-                                CreateBucketConfiguration={
-                                    'LocationConstraint': 'eu-west-2'
-                                })
+    bucket = s3_client.create_bucket(
+        Bucket="extract_bucket",
+        CreateBucketConfiguration={"LocationConstraint": "eu-west-2"},
+    )
     return bucket
 
+
 class TestListExistingS3Files:
     def test_error_if_no_bucket(self, s3_client, caplog):
-
         logger = logging.getLogger()
-        logger.info('Testing now.')
+        logger.info("Testing now.")
         caplog.set_level(logging.ERROR)
         list_existing_s3_files(client=s3_client)
-        assert 'Error listing S3 objects' in caplog.text
+        assert "Error listing S3 objects" in caplog.text
 
     def test_error_if_bucket_is_empty(self, s3_client, caplog, s3_mock_bucket):
-        list_existing_s3_files('extract_bucket', client=s3_client)
-        assert 'The bucket is empty' in caplog.text
-
+        list_existing_s3_files("extract_bucket", client=s3_client)
+        assert "The bucket is empty" in caplog.text
 
     # def test_error_retrieving_object(self, s3_client, caplog, s3_mock_bucket):
     #     s3_client.upload_file('tests/dummy.txt', 'extract_bucket', 'dummy.txt')
@@ -64,33 +74,36 @@ class TestListExistingS3Files:
 
     #     assert 'Error retrieving S3 object dummy.txt: ClientError' in caplog.text
 
-
     def test_retrieves_file_content(self, s3_client, caplog, s3_mock_bucket):
-        s3_client.upload_file('tests/dummy.txt', 'extract_bucket', 'dummy.txt')
-        result = list_existing_s3_files('extract_bucket', client=s3_client)
+        s3_client.upload_file("tests/dummy.txt", "extract_bucket", "dummy.txt")
+        result = list_existing_s3_files("extract_bucket", client=s3_client)
+
+        assert list(result.values()) == ["This is a test file."]
 
-        assert list(result.values()) == ['This is a test file.']
 
 class TestConnectToDatabase:
-    def test_connect_to_database(mock_conn, mock_config): ##had mock_config in param
-        with patch("src.extract_lambda.Connection", autospec=True) as mock_conn:  
+    # had mock_config in param
+    def test_connect_to_database(mock_conn, mock_config):
+        with patch("src.extract_lambda.Connection", autospec=True) as mock_conn:
             connect_to_database()
             mock_conn.assert_called_with(
-            host="abc", user="def", port="5432", password="password", database="db"
+                host="abc", user="def", port="5432", password="password", database="db"
             )
 
-    def test_database_error(self, mock_config):  ##had mock_config in param
+    def test_database_error(self, mock_config):  # had mock_config in param
         with pytest.raises(DBConnectionException):
             connect_to_database()
 
     def test_logs_interface_error(self, caplog):
         logger = logging.getLogger()
-        logger.info('Testing now.')
+        logger.info("Testing now.")
         caplog.set_level(logging.ERROR)
         with pytest.raises(DBConnectionException):
             connect_to_database()
-        assert 'Interface error' in caplog.text
-'''
+        assert "Interface error" in caplog.text
+
+
+"""
 class TestProcessAndUploadTables:
     def test_error_process_and_upload_tables(mock_conn, mock_config, s3_client, caplog):
         logger = logging.getLogger()
@@ -115,4 +128,4 @@ class TestProcessAndUploadTables:
             s3_client.upload_file('tests/dummy_identical.csv', 'extract_bucket', s3_key)
             process_and_upload_tables(mock_db(), existing_files, client=s3_client)
             assert 'No new data.' in caplog.text
-'''
\ No newline at end of file
+"""
-- 
cgit v1.2.3


From b80ad74122609fca98597d9a04518df855b58aed Mon Sep 17 00:00:00 2001
From: "deepsource-autofix[bot]"
 <62050782+deepsource-autofix[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:10:22 +0000
Subject: style: format code with Autopep8, Black and Ruff Formatter

This commit fixes the style issues introduced in 4a23069 according to the output
from Autopep8, Black and Ruff Formatter.

Details: https://github.com/ajschofield/de-project-bentley/pull/64
---
 tests/test_extract_lambda.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index b1894cc..a43ae0a 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -55,6 +55,7 @@ def s3_mock_bucket(s3_client):
     )
     return bucket
 
+
 class TestLambdaHandler:
     def test_lambda_handler_files_processed_and_uploaded_successfully(self, mocker):
         mock_db = MagicMock()
@@ -138,6 +139,7 @@ class TestLambdaHandler:
             mock_list_existing_s3_files.assert_not_called()
             mock_process_and_upload_tables.assert_not_called()
 
+
 class TestListExistingS3Files:
     def test_error_if_no_bucket(self, s3_client, caplog):
         logger = logging.getLogger()
@@ -175,4 +177,4 @@ class TestConnectToDatabase:
         caplog.set_level(logging.ERROR)
         with pytest.raises(DBConnectionException):
             connect_to_database()
-        assert "Interface error" in caplog.text
\ No newline at end of file
+        assert "Interface error" in caplog.text
-- 
cgit v1.2.3


From a42d030fb663ad7eb040498cfc5f0627a27d6cc6 Mon Sep 17 00:00:00 2001
From: "deepsource-autofix[bot]"
 <62050782+deepsource-autofix[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:11:44 +0000
Subject: style: format code with Autopep8, Black and Ruff Formatter

This commit fixes the style issues introduced in 4f629e5 according to the output
from Autopep8, Black and Ruff Formatter.

Details: https://github.com/ajschofield/de-project-bentley/pull/65
---
 src/extract_lambda.py        |  8 +++-----
 tests/test_extract_lambda.py | 34 ++++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 19 deletions(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/src/extract_lambda.py b/src/extract_lambda.py
index 5a5a631..9b17ef2 100644
--- a/src/extract_lambda.py
+++ b/src/extract_lambda.py
@@ -151,9 +151,9 @@ def process_and_upload_tables(db, existing_files, client=boto3.client("s3")):
         table_name = table[0]
         rows = db.run(
             f"SELECT * FROM {identifier(table_name)} WHERE last_updated >= :latest;",
-            latest={datetime.strftime(latest_timestamp, "%Y-%m-%d %H:%M:%S")},  
+            latest={datetime.strftime(latest_timestamp, "%Y-%m-%d %H:%M:%S")},
         )
-        print('rows', rows)
+        print("rows", rows)
         # Creating a temporary file path and writing the column name to it followed by each row of data
         if rows:
             csv_file_path = f"/tmp/{table_name}.csv"
@@ -183,7 +183,5 @@ def process_and_upload_tables(db, existing_files, client=boto3.client("s3")):
                 logger.error(f"Error uploading to S3: {e}")
         else:
             load_status["no change"].append(table_name)
-            logger.info(
-                f"No new data"
-            )
+            logger.info(f"No new data")
     return load_status
diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index 3405743..5a1c5b2 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -12,7 +12,7 @@ from src.extract_lambda import (
     DBConnectionException,
     lambda_handler,
     process_and_upload_tables,
-    retrieve_secrets
+    retrieve_secrets,
 )
 
 
@@ -25,7 +25,9 @@ def mock_config():
         "password": "password",
         "database": "db",
     }
-    with patch("src.extract_lambda.retrieve_secrets", return_value=env_vars) as mock_config:
+    with patch(
+        "src.extract_lambda.retrieve_secrets", return_value=env_vars
+    ) as mock_config:
         yield mock_config
 
 
@@ -185,31 +187,35 @@ class TestProcessAndUploadTables:
         queries = [
             "SELECT table_name FROM information_schema.tables WHERE table_schema='public' AND table_type='BASE TABLE';",
             "SELECT * FROM Fruits WHERE last_updated > :latest;",
-            "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS where table_name = 'Fruits';"
+            "SELECT column_name FROM INFORMATION_SCHEMA.COLUMNS where table_name = 'Fruits';",
         ]
         return_values = [
-            [['Fruits']],
+            [["Fruits"]],
             [],  # No new rows with a more recent last_updated timestamp
-            [['Food_type'], ['Flavour'], ['Colour'], ['last_updated']]
+            [["Food_type"], ["Flavour"], ["Colour"], ["last_updated"]],
         ]
         vals = dict(zip(queries, return_values))
 
         # Patch the database connection and set return values for queries
-        with patch('src.extract_lambda.Connection') as mock_db:
+        with patch("src.extract_lambda.Connection") as mock_db:
             mock_db().run.side_effect = return_values
-            s3_key = 'Fruits/2024/08/15/Fruits_16:46:30.csv'
+            s3_key = "Fruits/2024/08/15/Fruits_16:46:30.csv"
             existing_files = {
-                s3_key: 'Food_type,Flavour,Colour,last_updated\nVegetable,Sour,Green,2022-11-03 14:20:49.962\nBerry,Sweet,Red,2022-11-03 14:20:49.962'
+                s3_key: "Food_type,Flavour,Colour,last_updated\nVegetable,Sour,Green,2022-11-03 14:20:49.962\nBerry,Sweet,Red,2022-11-03 14:20:49.962"
             }
 
             # Simulate S3 bucket and file setup
-            s3_client.create_bucket(Bucket='test_extract_bucket', 
-                                    CreateBucketConfiguration={'LocationConstraint': 'eu-west-2'})
-            s3_client.upload_file('tests/dummy_identical.csv', 'test_extract_bucket', s3_key)
-            
+            s3_client.create_bucket(
+                Bucket="test_extract_bucket",
+                CreateBucketConfiguration={"LocationConstraint": "eu-west-2"},
+            )
+            s3_client.upload_file(
+                "tests/dummy_identical.csv", "test_extract_bucket", s3_key
+            )
+
             # Run the process_and_upload_tables function
             process_and_upload_tables(mock_db(), existing_files, client=s3_client)
             # Assert that the log contains "No new data"
-            assert 'No new data' in caplog.text
+            assert "No new data" in caplog.text
 
-    # process and upload tables needs more tests
\ No newline at end of file
+    # process and upload tables needs more tests
-- 
cgit v1.2.3


From b499d78dc660017694ec683c90aba3f558c00669 Mon Sep 17 00:00:00 2001
From: "deepsource-autofix[bot]"
 <62050782+deepsource-autofix[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 16:14:07 +0000
Subject: style: format code with Autopep8, Black and Ruff Formatter

This commit fixes the style issues introduced in f014d1a according to the output
from Autopep8, Black and Ruff Formatter.

Details: https://github.com/ajschofield/de-project-bentley/pull/65
---
 tests/test_extract_lambda.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index 347ef22..3931cfc 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -180,6 +180,7 @@ class TestConnectToDatabase:
             connect_to_database()
         assert "Interface error" in caplog.text
 
+
 class TestProcessAndUploadTables:
     def test_error_process_and_upload_tables(mock_conn, s3_client, caplog):
         caplog.set_level(logging.INFO)
@@ -218,4 +219,3 @@ class TestProcessAndUploadTables:
             process_and_upload_tables(mock_db(), existing_files, client=s3_client)
             # Assert that the log contains "No new data"
             assert "No new data" in caplog.text
-
-- 
cgit v1.2.3


From 7c77382fdaf236247a35f35810d66a86923156dd Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Tue, 20 Aug 2024 00:10:40 +0100
Subject: fix(): update expected response message

---
 tests/test_extract_lambda.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index 3931cfc..9362a6c 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -72,7 +72,11 @@ class TestLambdaHandler:
         ]
         with patch("src.extract_lambda.connect_to_database", return_value=mock_db):
             mock_process_and_upload_tables = mocker.patch(
-                "src.extract_lambda.process_and_upload_tables", return_value=mock_db
+                "src.extract_lambda.process_and_upload_tables",
+                return_value={
+                    "updated": ["Fruits"],
+                    "no change": ["Vegetable", "Berry"],
+                },
             )
             mock_list_existing_s3_files = mocker.patch(
                 "src.extract_lambda.list_existing_s3_files", return_value={}
@@ -81,9 +85,9 @@ class TestLambdaHandler:
             context = {}
             response = lambda_handler(event, context)
             assert response["statusCode"] == 200
-            assert (
-                json.loads(response["body"])
-                == "CSV files processed and uploaded successfully."
+            assert json.loads(response["body"]) == (
+                "CSV files processed for Fruits and uploaded successfully."
+                "The following tables were not updated: Vegetable, Berry"
             )
             mock_list_existing_s3_files.assert_called_once()
             mock_process_and_upload_tables.assert_called_once_with(mock_db, {})
-- 
cgit v1.2.3


From bf7aab5cdbf2007824f0fb2bff2de5a4fa8196ba Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Tue, 20 Aug 2024 00:11:37 +0100
Subject: chore(tests): rename lambda_handler class test functions

---
 tests/test_extract_lambda.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index 9362a6c..b9e3a4b 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -58,7 +58,7 @@ def s3_mock_bucket(s3_client):
 
 
 class TestLambdaHandler:
-    def test_lambda_handler_files_processed_and_uploaded_successfully(self, mocker):
+    def test_files_processed_and_uploaded_successfully(self, mocker):
         mock_db = MagicMock()
         mock_db.run.side_effect = [
             [["Fruits"]],
@@ -93,7 +93,7 @@ class TestLambdaHandler:
             mock_process_and_upload_tables.assert_called_once_with(mock_db, {})
             mock_db.close.assert_called_once()
 
-    def test_lambda_handler_no_changes_detected_no_files_uploaded(self, mocker):
+    def test_no_changes_detected_no_files_uploaded(self, mocker):
         mock_db = MagicMock()
         mock_db.run.side_effect = [
             [["Fruits"]],
@@ -125,7 +125,7 @@ class TestLambdaHandler:
             mock_process_and_upload_tables.assert_called_once_with(mock_db, {})
             mock_db.close.assert_called_once()
 
-    def test_lambda_handler_exception_error(self, mocker):
+    def test_exception_error(self, mocker):
         with patch(
             "src.extract_lambda.connect_to_database",
             side_effect=Exception("Database connection error"),
-- 
cgit v1.2.3


From 32175a3b4387a8218b4e21561173445fd5b5df1d Mon Sep 17 00:00:00 2001
From: Alex Schofield <git@ajschof.me>
Date: Tue, 20 Aug 2024 00:13:45 +0100
Subject: fix(): update expected response message for second test

---
 tests/test_extract_lambda.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index b9e3a4b..3d15927 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -108,7 +108,8 @@ class TestLambdaHandler:
 
         with patch("src.extract_lambda.connect_to_database", return_value=mock_db):
             mock_process_and_upload_tables = mocker.patch(
-                "src.extract_lambda.process_and_upload_tables", return_value=False
+                "src.extract_lambda.process_and_upload_tables",
+                return_value={"updated": [], "no change": ["Fruits"]},
             )
             mock_list_existing_s3_files = mocker.patch(
                 "src.extract_lambda.list_existing_s3_files", return_value={}
-- 
cgit v1.2.3


From e788a90307831d968fcac51dc5d70d356a5a5f63 Mon Sep 17 00:00:00 2001
From: lian-manonog <lian.manonog@gmail.com>
Date: Tue, 20 Aug 2024 12:05:56 +0100
Subject: Complete: completed testing for extract bucket - all passing

---
 tests/test_extract_lambda.py | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index 3d15927..3cd2405 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -15,6 +15,7 @@ from src.extract_lambda import (
     lambda_handler,
     process_and_upload_tables,
     retrieve_secrets,
+    extract_bucket
 )
 
 
@@ -146,6 +147,31 @@ class TestLambdaHandler:
             mock_process_and_upload_tables.assert_not_called()
 
 
+class TestExtractBucket:
+    def test_extract_bucket_returns_bucket_name(self, s3_client, s3_mock_bucket):
+        result = extract_bucket(s3_client)
+        assert result == "extract_bucket"
+
+    def test_bucket_returns_first_bucket(self, s3_client):
+        bucket1 = s3_client.create_bucket(
+            Bucket='bucket1',
+            CreateBucketConfiguration={"LocationConstraint": "eu-west-2"},
+        )
+        result = extract_bucket(s3_client)
+        assert result == "extract_bucket"
+
+    def test_returns_index_error_if_no_buckets(self, s3_client):
+        s3_client.delete_bucket(
+            Bucket="extract_bucket"
+        )
+        s3_client.delete_bucket(
+            Bucket="bucket1"
+        )
+
+        with pytest.raises(IndexError, match="list index out of range"):
+            extract_bucket(s3_client)
+
+    
 class TestListExistingS3Files:
     def test_error_if_no_bucket(self, s3_client, caplog):
         logger = logging.getLogger()
@@ -165,7 +191,6 @@ class TestListExistingS3Files:
 
 
 class TestConnectToDatabase:
-    # had mock_config in param
     def test_connect_to_database(mock_conn, mock_config):
         with patch("src.extract_lambda.Connection", autospec=True) as mock_conn:
             connect_to_database()
@@ -187,7 +212,7 @@ class TestConnectToDatabase:
 
 
 class TestProcessAndUploadTables:
-    def test_error_process_and_upload_tables(mock_conn, s3_client, caplog):
+    def test_error_process_and_upload_tables(self, mock_conn, s3_client, caplog):
         caplog.set_level(logging.INFO)
 
         # Mock return values for database queries
-- 
cgit v1.2.3


From 0870dc49ddbd6024dddb289909487a15c26a3383 Mon Sep 17 00:00:00 2001
From: "deepsource-autofix[bot]"
 <62050782+deepsource-autofix[bot]@users.noreply.github.com>
Date: Tue, 20 Aug 2024 11:08:24 +0000
Subject: style: format code with Autopep8, Black and Ruff Formatter

This commit fixes the style issues introduced in e788a90 according to the output
from Autopep8, Black and Ruff Formatter.

Details: https://github.com/ajschofield/de-project-bentley/pull/72
---
 tests/test_extract_lambda.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'tests/test_extract_lambda.py')

diff --git a/tests/test_extract_lambda.py b/tests/test_extract_lambda.py
index 3cd2405..548ce67 100644
--- a/tests/test_extract_lambda.py
+++ b/tests/test_extract_lambda.py
@@ -15,7 +15,7 @@ from src.extract_lambda import (
     lambda_handler,
     process_and_upload_tables,
     retrieve_secrets,
-    extract_bucket
+    extract_bucket,
 )
 
 
@@ -154,24 +154,20 @@ class TestExtractBucket:
 
     def test_bucket_returns_first_bucket(self, s3_client):
         bucket1 = s3_client.create_bucket(
-            Bucket='bucket1',
+            Bucket="bucket1",
             CreateBucketConfiguration={"LocationConstraint": "eu-west-2"},
         )
         result = extract_bucket(s3_client)
         assert result == "extract_bucket"
 
     def test_returns_index_error_if_no_buckets(self, s3_client):
-        s3_client.delete_bucket(
-            Bucket="extract_bucket"
-        )
-        s3_client.delete_bucket(
-            Bucket="bucket1"
-        )
+        s3_client.delete_bucket(Bucket="extract_bucket")
+        s3_client.delete_bucket(Bucket="bucket1")
 
         with pytest.raises(IndexError, match="list index out of range"):
             extract_bucket(s3_client)
 
-    
+
 class TestListExistingS3Files:
     def test_error_if_no_bucket(self, s3_client, caplog):
         logger = logging.getLogger()
-- 
cgit v1.2.3