fix: TT-357 change uuid pk of activity for integer and change test

Author: ararcos

V2/tests/api/azure/activity_azure_endpoints_test.py

@@ -5,97 +5,91 @@
 
 import azure.functions as func
 import sqlalchemy
+from sqlalchemy.sql.sqltypes import Integer
 
 import time_entries._application._activities as azure_activities
 import time_entries._domain as domain 
 import time_entries._infrastructure as infrastructure 
 
 ACTIVITY_URL = '/api/activities/'
 
-
-@pytest.fixture(name='create_fake_database')
-def _create_fake_database() -> domain.ActivitiesDao:
-    db_fake = infrastructure.DB('sqlite:///:memory:')
-    demo_data = [
+DEMO_DATA = [
         {
-        'id': uuid.UUID('b4327ba6-9f96-49ee-a9ac-3c1edf525172'),
+        'id': 1,
         'name': 'Activity Demo create',
         'description': 'test demo create an new activity',
         'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
         'status': 'active',
         'tenant_id': 'cc925a5d-9644-4a4f-8d99-0bee49aadd05',
         },
         {
-        'id': uuid.UUID('c61a4a49-3364-49a3-a7f7-0c5f2d15072b'),
+        'id': 2,
         'name': 'Activity Demo create',
         'description': 'test demo create an new activity',
         'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
         'status': 'active',
         'tenant_id': 'cc925a5d-9644-4a4f-8d99-0bee49aadd05',
         },
     ]
+
+@pytest.fixture(name='create_fake_database')
+def _create_fake_database() -> domain.ActivitiesDao:
+    db_fake = infrastructure.DB('sqlite:///:memory:')
+    
     activity = sqlalchemy.Table('activity', db_fake.metadata,
-                                     sqlalchemy.Column('name', sqlalchemy.String),
-                                     sqlalchemy.Column('id', infrastructure.GUID(), primary_key=True, default=uuid.uuid4),
-                                     sqlalchemy.Column('description', sqlalchemy.String),
-                                     sqlalchemy.Column('deleted', sqlalchemy.String),
-                                     sqlalchemy.Column('status', sqlalchemy.String),
-                                     sqlalchemy.Column('tenant_id', sqlalchemy.String),
-                                     extend_existing=True,
-                                     )
+                    sqlalchemy.Column('id',sqlalchemy.Integer, primary_key=True,autoincrement=True),
+                    sqlalchemy.Column('name', sqlalchemy.String),
+                    sqlalchemy.Column('description', sqlalchemy.String),
+                    sqlalchemy.Column('deleted', sqlalchemy.String),
+                    sqlalchemy.Column('status', sqlalchemy.String),
+                    sqlalchemy.Column('tenant_id', sqlalchemy.String),
+                     extend_existing=True,
+              )
 
     query = activity.insert()
-    db_fake.get_session().execute(query, demo_data)
-    return db_fake, demo_data
+    db_fake.get_session().execute(query, DEMO_DATA)
+    return db_fake
 
 def test__activity_azure_endpoint__returns_all_activities(
     create_fake_database,
 ):
-    database, activity_data = create_fake_database
-    azure_activities._get_activities.DATABASE = database
+    azure_activities._get_activities.DATABASE = create_fake_database
     req = func.HttpRequest(method='GET', body=None, url=ACTIVITY_URL)
 
     response = azure_activities._get_activities.get_activities(req)
     activities_json_data = response.get_body().decode("utf-8")
 
-    for activity in activity_data:
-        activity["id"] = activity["id"].hex
-  
     assert response.status_code == 200
-    assert activities_json_data == json.dumps(activity_data)
+    assert activities_json_data == json.dumps(DEMO_DATA)
 
 
 def test__activity_azure_endpoint__returns_an_activity__when_activity_matches_its_id(
     create_fake_database,
 ):
-    database, activity_data = create_fake_database
-    azure_activities._get_activities.DATABASE = database
+    azure_activities._get_activities.DATABASE = create_fake_database
     req = func.HttpRequest(
         method='GET',
         body=None,
         url=ACTIVITY_URL,
-        route_params={"id": str(activity_data[0]['id'])},
+        route_params={"id": str(DEMO_DATA[0]['id'])},
     )
 
     response = azure_activities._get_activities.get_activities(req)
     activitiy_json_data = response.get_body().decode("utf-8")
 
-    activity_data[0]["id"] = activity_data[0]["id"].hex
-
     assert response.status_code == 200
-    assert activitiy_json_data == json.dumps(activity_data[0])
+    assert activitiy_json_data == json.dumps(DEMO_DATA[0])
 
 
 def test__activity_azure_endpoint__returns_an_activity_with_inactive_status__when_an_activity_matching_its_id_is_found(
     create_fake_database,
 ):
-    database, activity_data = create_fake_database
-    azure_activities._delete_activity.DATABASE = database
+    azure_activities._delete_activity.DATABASE = create_fake_database
     req = func.HttpRequest(
         method='DELETE',
         body=None,
         url=ACTIVITY_URL,
-        route_params={"id": str(activity_data[0]['id'])},
+        route_params={"id": str(DEMO_DATA[0]['id'])},
     )
 
     response = azure_activities._delete_activity.delete_activity(req)
@@ -108,30 +102,26 @@ def test__activity_azure_endpoint__returns_an_activity_with_inactive_status__whe
 def test__update_activity_azure_endpoint__returns_an_activity__when_found_an_activity_to_update(
     create_fake_database,
 ):
-    database, activity_data = create_fake_database
-    azure_activities._update_activity.DATABASE = database
+    azure_activities._update_activity.DATABASE = create_fake_database
     activity_body = {"description": Faker().sentence()}
     req = func.HttpRequest(
         method='PUT',
         body=json.dumps(activity_body).encode("utf-8"),
         url=ACTIVITY_URL,
-        route_params={"id": str(activity_data[0]['id'])},
+        route_params={"id": str(DEMO_DATA[0]['id'])},
     )
 
-    activity_data[0]["id"] = activity_data[0]["id"].hex
-
     response = azure_activities._update_activity.update_activity(req)
     activitiy_json_data = response.get_body().decode("utf-8")
-    new_activity = {**activity_data[0], **activity_body}
+    new_activity = {**DEMO_DATA[0], **activity_body}
 
     assert response.status_code == 200
     assert activitiy_json_data == json.dumps(new_activity)
 
 def test__activity_azure_endpoint__creates_an_activity__when_activity_has_all_attributes(
      create_fake_database,
  ):
-     database, activity_data = create_fake_database
-     azure_activities._create_activity.DATABASE = database
+     azure_activities._create_activity.DATABASE = create_fake_database
 
      activity_body = {'id': None, 'name': Faker().user_name(), 'description': Faker().sentence(),'deleted': Faker().uuid4() ,'status': 'active', 'tenant_id': Faker().uuid4()}
      body = json.dumps(activity_body).encode("utf-8")

V2/tests/integration/daos/activities_sql_dao_test.py

@@ -4,11 +4,7 @@
 import time_entries._domain as domain 
 import time_entries._infrastructure as infrastructure 
 
-
-@pytest.fixture(name='create_fake_dao')
-def _create_fake_dao(with_data: bool) -> domain.ActivitiesDao:
-    db_fake = infrastructure.DB('sqlite:///:memory:')
-    demo_data = [
+DEMO_DATA = [
         {
         'id': uuid.UUID('b4327ba6-9f96-49ee-a9ac-3c1edf525172'),
         'name': 'Activity Demo create',
@@ -26,14 +22,14 @@ def _create_fake_dao(with_data: bool) -> domain.ActivitiesDao:
         'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
         },
     ]
+
+@pytest.fixture(name='create_fake_dao')
+def _create_fake_dao() -> domain.ActivitiesDao:
+    db_fake = infrastructure.DB('sqlite:///:memory:')
     dao = infrastructure.ActivitiesSQLDao(db_fake)
-    if with_data:
-      query = dao.activity.insert()
-      db_fake.get_session().execute(query, demo_data)
     return dao
 
 
-@pytest.mark.parametrize('with_data',[False])
 def test__create_activity__returns_a_activity_dto__when_saves_correctly_with_sql_database(create_fake_dao):
   activity = {
         'name': 'Activity Demo create',
@@ -42,110 +38,67 @@ def test__create_activity__returns_a_activity_dto__when_saves_correctly_with_sql
         'status': 'active',
         'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
         }
-  
-  results = create_fake_dao.create_activity(activity)
-  assert results.id != None
+  results = create_fake_dao.create(activity)
+  activity.update({"id":results.id})
+  expected_result=domain.Activity(**activity)
+  assert results == expected_result
 
 
-@pytest.mark.parametrize('with_data',[True])
-def test_update__returns_an_activity_updated__when_an_activity_matching_its_id_is_found_with_sql_database(create_fake_dao):
-    activity = {
-        'name': 'Activity Demo create 3',
-        'tenant_id': 'cc925a5d-9644-4a4f-8d99-0bee49aadd05',
-        'description': 'test demo create an new activity',
-        'status': 'active',
-        'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
+def test_update__returns_an_update_activity__when_an_activity_matching_its_id_is_found_with_sql_database(create_fake_dao):
+    create_fake_dao.create(DEMO_DATA[0])
+    activity_body = {
+        'description': 'test demo 2 create an new activity',
         }
-    expected_result=domain.Activity(**{
-        'id': 'b4327ba69f9649eea9ac3c1edf525172',
-        'name': 'Activity Demo create 3',
-        'tenant_id': 'cc925a5d-9644-4a4f-8d99-0bee49aadd05',
-        'description': 'test demo create an new activity',
-        'status': 'active',
-        'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
-        })
-    results = create_fake_dao.update_activity('b4327ba69f9649eea9ac3c1edf525172',activity)
+    new_activity = {**DEMO_DATA[0], **activity_body}
+    expected_result=domain.Activity(**new_activity)
+    results = create_fake_dao.update('1',activity_body)
     assert results == expected_result
 
 
-@pytest.mark.parametrize('with_data',[False])
 def test_update__returns_none__when_no_activity_matching_its_id_is_found_with_sql_database(create_fake_dao):
-    activity = {
-        'name': 'Activity Demo create 3',
-        'tenant_id': 'cc925a5d-9644-4a4f-8d99-0bee49aadd05',
-        'description': 'test demo create an new activity',
-        'status': 'active',
-        'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
-        }
-    results = create_fake_dao.update_activity('b4327ba69f9649eea9ac3c1edf525172',activity)
+    results = create_fake_dao.update('1',DEMO_DATA[0])
     assert results == None
 
 
-@pytest.mark.parametrize('with_data',[True])
 def test__get_all__returns_a_list_of_activity_dto_objects__when_one_or_more_activities_are_found_with_sql_database(create_fake_dao):
+    create_fake_dao.create(DEMO_DATA[0])
+    create_fake_dao.create(DEMO_DATA[1])
     expected_result=[
-      domain.Activity(**{
-        'id': 'b4327ba69f9649eea9ac3c1edf525172',
-        'name': 'Activity Demo create',
-        'tenant_id': 'cc925a5d-9644-4a4f-8d99-0bee49aadd05',
-        'description': 'test demo create an new activity',
-        'status': 'active',
-        'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
-        }),
-      domain.Activity(**{
-        'id': 'c61a4a49336449a3a7f70c5f2d15072b',
-        'name': 'Activity Demo create',
-        'tenant_id': 'cc925a5d-9644-4a4f-8d99-0bee49aadd05',
-        'description': 'test demo create an new activity',
-        'status': 'active',
-        'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
-        }),
+      domain.Activity(**DEMO_DATA[0]),
+      domain.Activity(**DEMO_DATA[1]),
     ]
-    results = create_fake_dao.get_all_activities()
+    results = create_fake_dao.get_all()
     assert results == expected_result
 
 
-@pytest.mark.parametrize('with_data',[True])
 def test_get_by_id__returns_an_activity_dto__when_found_one_activity_that_matches_its_id_with_sql_database(create_fake_dao):
-    expected_result=domain.Activity(**{
-        'id': 'b4327ba69f9649eea9ac3c1edf525172',
-        'name': 'Activity Demo create',
-        'tenant_id': 'cc925a5d-9644-4a4f-8d99-0bee49aadd05',
-        'description': 'test demo create an new activity',
-        'status': 'active',
-        'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
-        })
-    results = create_fake_dao.get_activity_by_id('b4327ba69f9649eea9ac3c1edf525172')
+    create_fake_dao.create(DEMO_DATA[0])
+    expected_result=domain.Activity(**DEMO_DATA[0])
+    results = create_fake_dao.get_by_id('1')
     assert results == expected_result
 
 
-@pytest.mark.parametrize('with_data',[False])
 def test__get_by_id__returns_none__when_no_activity_matches_its_id_with_sql_database(create_fake_dao):    
-    results = create_fake_dao.get_activity_by_id('b4327ba69f9649eea9ac3c1edf525172')
+    results = create_fake_dao.get_by_id('1')
     assert results == None
 
 
-@pytest.mark.parametrize('with_data',[False])
 def test_get_all__returns_an_empty_list__when_doesnt_found_any_activities_with_sql_database(create_fake_dao):
-    results = create_fake_dao.get_all_activities()
+    results = create_fake_dao.get_all()
     assert results == []
 
 
-@pytest.mark.parametrize('with_data',[True])
 def test_delete__returns_an_activity_with_inactive_status__when_an_activity_matching_its_id_is_found_with_sql_database(create_fake_dao):
-    expected_result=domain.Activity(**{
-        'id': 'b4327ba69f9649eea9ac3c1edf525172',
-        'name': 'Activity Demo create',
-        'tenant_id': 'cc925a5d-9644-4a4f-8d99-0bee49aadd05',
-        'description': 'test demo create an new activity',
+    create_fake_dao.create(DEMO_DATA[0])
+    activity_body = {
         'status': 'inactive',
-        'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
-        })
-    results = create_fake_dao.delete_activity('b4327ba69f9649eea9ac3c1edf525172')
+        }
+    new_activity = {**DEMO_DATA[0], **activity_body}
+    expected_result=domain.Activity(**new_activity)
+    results = create_fake_dao.delete('1')
     assert results == expected_result
 
 
-@pytest.mark.parametrize('with_data',[False])
 def test_delete__returns_none__when_no_activity_matching_its_id_is_found_with_sql_database(create_fake_dao):
-    results = create_fake_dao.delete_activity('b4327ba69f9649eea9ac3c1edf525172')
+    results = create_fake_dao.delete('2')
     assert results == None