modify logs and test

Author: surajit

routes/v1/company.py

@@ -1,9 +1,11 @@
 from fastapi import APIRouter
 from fastapi import Depends
 from fastapi import HTTPException
+from fastapi import Request
 from sqlalchemy.orm import Session
 
 from crud.company import CompanyExistException
+from logger.log import save_log
 from schemas import schema
 from hubspot_api import utils
 from dependencies.dependencies import get_db
@@ -17,7 +19,8 @@
 
 
 @router.post("/companies/")
-def create_company(company: schema.CreateCompany, db: Session = Depends(get_db)):
+@save_log
+async def create_company(request: Request, company: schema.CreateCompany, db: Session = Depends(get_db)):
     db_company = None
     try:
         db_company = _company.create_company(db, company)
@@ -30,7 +33,8 @@ def create_company(company: schema.CreateCompany, db: Session = Depends(get_db))
 
 
 @router.get("/company/{company_name}/")
-def get_company(company_name):
+@save_log
+async def get_company(request: Request, company_name):
     try:
         company = utils.get_company_by_name(company_name)
     except utils.CompanyException as exc:

routes/v1/contact.py

@@ -1,10 +1,12 @@
 from fastapi import APIRouter
 from fastapi import Depends
 from fastapi import HTTPException
+from fastapi import Request
 from sqlalchemy.orm import Session
 
 from crud.contact import ContactExistException
 from crud import contact as _contact
+from logger.log import save_log
 from schemas import schema
 from hubspot_api import utils
 from dependencies.dependencies import get_db
@@ -18,7 +20,9 @@
 
 
 @router.post("/contacts/")
-def create_contact(contact: schema.CreateContact, db: Session = Depends(get_db)):
+@save_log
+async def create_contact(request: Request, contact: schema.CreateContact,
+                         db: Session = Depends(get_db)):
     db_contact = None
     try:
         org_name = contact.company_name
@@ -33,7 +37,8 @@ def create_contact(contact: schema.CreateContact, db: Session = Depends(get_db))
 
 
 @router.get("/contact/{email}/")
-def get_contact(email):
+@save_log
+async def get_contact(request: Request, email):
     try:
         contact = utils.get_contact_by_email(email)
     except utils.ContactException as exc:

tests/routes/test_company.py

@@ -5,15 +5,21 @@
 
 
 @mock.patch("routes.v1.company.utils.get_company_by_name")
-def test_company(mock_get_company_by_name, client):
+@mock.patch("logger.log.logger.debug")
+def test_company(mock_logger_debug,
+                 mock_get_company_by_name, client):
+    mock_logger_debug.return_value = "Ok"
     mock_get_company_by_name.return_value = {"id": 12345}
     response = client.get("/api/v1/company/test-company/")
     assert response.status_code == 200
     assert response.json() == {"id": 12345}
 
 
 @mock.patch("routes.v1.company.utils.get_company_by_name")
-def test_company_for_hubspot_companyexception(mock_get_company_by_name, client):
+@mock.patch("logger.log.logger.debug")
+def test_company_for_hubspot_company_exception(mock_logger_debug,
+                                               mock_get_company_by_name, client):
+    mock_logger_debug.return_value = "Ok"
     mock_get_company_by_name.side_effect = CompanyException(
         "Something went wrong in fetching company from Hubspot"
     )
@@ -25,7 +31,9 @@ def test_company_for_hubspot_companyexception(mock_get_company_by_name, client):
 
 
 @mock.patch("routes.v1.company.utils.create_company")
-def test_create_company(mock_create_company, client):
+@mock.patch("logger.log.logger.debug")
+def test_create_company(mock_logger_debug, mock_create_company, client):
+    mock_logger_debug.return_value = "Ok"
     mock_create_company.return_value = {"company_id": 1111}
     response = client.post(
         "/api/v1/companies/", json={"org_id": 123, "name": "Warner Bros co"}
@@ -35,7 +43,10 @@ def test_create_company(mock_create_company, client):
 
 
 @mock.patch("routes.v1.company.utils.create_company")
-def test_create_company_with_hubspot_companyexception(mock_create_company, client, db):
+@mock.patch("logger.log.logger.debug")
+def test_create_company_with_hubspot_company_exception(mock_logger_debug, mock_create_company,
+                                                       client, db):
+    mock_logger_debug.return_value = "Ok"
     mock_create_company.side_effect = CompanyException(
         "Something went wrong in creating company in Hubspot"
     )
@@ -50,25 +61,31 @@ def test_create_company_with_hubspot_companyexception(mock_create_company, clien
     assert company == []
 
 
-def test_create_company_with_duplicate_organization_org_id(client, organization):
+@mock.patch("logger.log.logger.debug")
+def test_create_company_with_duplicate_organization_org_id(mock_logger_debug,
+                                                           client, organization):
+    mock_logger_debug.return_value = "Ok"
     response = client.post(
         "/api/v1/companies/", json={"org_id": 12345, "name": "UWISO"}
     )
     assert response.status_code == 200
     assert response.json() == {
         "detail": "duplicate key value violates unique constraint "
-        '"organization_org_id_key"\nDETAIL:  Key (org_id)=('
-        "12345) already exists.\n"
+                  '"organization_org_id_key"\nDETAIL:  Key (org_id)=('
+                  "12345) already exists.\n"
     }
 
 
-def test_create_company_with_duplicate_organization_name(client, organization):
+@mock.patch("logger.log.logger.debug")
+def test_create_company_with_duplicate_organization_name(mock_logger_debug,
+                                                         client, organization):
+    mock_logger_debug.return_value = "Ok"
     response = client.post(
         "/api/v1/companies/", json={"org_id": 1232245, "name": "Test org"}
     )
     assert response.status_code == 200
     assert response.json() == {
         "detail": "duplicate key value violates unique constraint "
-        '"organization_name_key"\nDETAIL:  Key (name)=('
-        "Test org) already exists.\n"
+                  '"organization_name_key"\nDETAIL:  Key (name)=('
+                  "Test org) already exists.\n"
     }

tests/routes/test_contact.py

@@ -5,7 +5,9 @@
 
 
 @mock.patch("routes.v1.contact.utils.get_contact_by_email")
-def test_get_contact_by_email(mock_get_contact_by_email, client):
+@mock.patch("logger.log.logger.debug")
+def test_get_contact_by_email(mock_logger_debug, mock_get_contact_by_email, client):
+    mock_logger_debug.return_value = "Ok"
     mock_get_contact_by_email.return_value = {
         "id": "1234",
         "email": "[email protected]",
@@ -24,9 +26,11 @@ def test_get_contact_by_email(mock_get_contact_by_email, client):
 
 @mock.patch("routes.v1.contact.utils.create_contact")
 @mock.patch("routes.v1.contact._contact.create_contact")
+@mock.patch("logger.log.logger.debug")
 def test_create_contact(
-    mock_db_create_contact, mock_hubspot_create_contact, organization, client
+        mock_logger_debug, mock_db_create_contact, mock_hubspot_create_contact, organization, client
 ):
+    mock_logger_debug.return_value = "Ok"
     mock_db_create_contact.return_value = {
         "first_name": "raaj",
         "last_name": "das",
@@ -48,7 +52,10 @@ def test_create_contact(
     assert response.json() == {"contact_id": 12356}
 
 
-def test_create_contact_returns_duplicate_email_error(organization, contact, client):
+@mock.patch("logger.log.logger.debug")
+def test_create_contact_returns_duplicate_email_error(mock_logger_debug,
+                                                      organization, contact, client):
+    mock_logger_debug.return_value = "Ok"
     response = client.post(
         "/api/v1/contacts/",
         json={
@@ -62,16 +69,19 @@ def test_create_contact_returns_duplicate_email_error(organization, contact, cli
     assert response.status_code == 200
     assert response.json() == {
         "detail": "duplicate key value violates unique constraint "
-        '"contact_email_key"\nDETAIL:  Key (email)=('
-        "[email protected]) already exists.\n"
+                  '"contact_email_key"\nDETAIL:  Key (email)=('
+                  "[email protected]) already exists.\n"
     }
 
 
 @mock.patch("routes.v1.contact._contact.delete_contact")
 @mock.patch("routes.v1.contact.utils.create_contact")
+@mock.patch("logger.log.logger.debug")
 def test_create_contact_raises_hubspot_contactexception(
-    mock_create_contact, mock_delete_contact, organization, client
+        mock_logger_debug,
+        mock_create_contact, mock_delete_contact, organization, client
 ):
+    mock_logger_debug.return_value = "Ok"
     mock_create_contact.side_effect = ContactException(
         "Email with this contact exists in Hubspot"
     )
@@ -91,9 +101,11 @@ def test_create_contact_raises_hubspot_contactexception(
 
 
 @mock.patch("routes.v1.contact.utils.create_contact")
+@mock.patch("logger.log.logger.debug")
 def test_create_contact_rollbacks_db_contact_for_hubspot_exception(
-    mock_create_contact, db, organization, client
+        mock_logger_debug, mock_create_contact, db, organization, client
 ):
+    mock_logger_debug.return_value = "Ok"
     mock_create_contact.side_effect = ContactException(
         "Email with this contact exists " "in Hubspot"
     )