replace make_reponse for jsonify on endpoints

tests/mock_gang_repository.py → tests/mocks/mock_gang_repository.py

@@ -12,7 +12,7 @@ def __init__(self):
     def of_id(self, gang_id: int) -> Gang:
         return self.gang
 
-    def add(self, new_gang: Gang) -> NoReturn:
+    def add(self, new_gang: Gang) -> int:
         pass
 
     def update(self, mod_gang: Gang) -> NoReturn:
@@ -38,4 +38,4 @@ def all(self) -> List[Gang]:
         gang2.add_members(members_gang2)
         gang3.add_members(members_gang3)
 
-        return [gang1, gang2, gang3]
+        return [gang1, gang2, gang3]

tests/mock_outlaw_repository.py → tests/mocks/mock_outlaw_repository.py

@@ -12,8 +12,9 @@ def __init__(self):
     def of_id(self, outlaw_id) -> Outlaw:
         return self.outlaw
 
-    def add(self, new_outlaw: Outlaw) -> NoReturn:
+    def add(self, new_outlaw: Outlaw) -> int:
         self.outlaw = new_outlaw
+        return 1
 
     def update(self, mod_outlaw: Outlaw) -> NoReturn:
         self.outlaw = mod_outlaw

tests/test_create_gang.py

@@ -0,0 +1,14 @@
+from tests.mocks.mock_gang_repository import MockGangRepository
+from thesheriff.application.gang.request.create_gang_request import CreateGangRequest
+from thesheriff.application.outlaw.create_gang import CreateGang
+
+
+def test_create_gang():
+    gang_repository = MockGangRepository()
+
+    request = CreateGangRequest(1, "super gang")
+
+    gang = CreateGang(gang_repository).execute(request)
+
+    assert gang.owner_id == 1
+    assert gang.name == "super gang"

tests/test_create_outlaw.py

@@ -1,4 +1,4 @@
-from tests.mock_outlaw_repository import MockOutlawRepository
+from tests.mocks.mock_outlaw_repository import MockOutlawRepository
 from thesheriff.application.outlaw.create_outlaw import CreateOutlaw
 from thesheriff.application.outlaw.request.create_outlaw_request import CreateOutlawRequest
 

tests/test_create_raid.py

@@ -1,6 +1,6 @@
-from tests.mock_gang_repository import MockGangRepository
-from tests.mock_outlaw_repository import MockOutlawRepository
-from tests.mock_raid_repository import MockRaidRepository
+from tests.mocks.mock_gang_repository import MockGangRepository
+from tests.mocks.mock_outlaw_repository import MockOutlawRepository
+from tests.mocks.mock_raid_repository import MockRaidRepository
 from thesheriff.application.raid.create_raid import CreateRaid
 from thesheriff.application.raid.request.create_raid_request import CreateRaidRequest
 from thesheriff.domain.outlaw.outlaw import Outlaw

tests/test_end_raid.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from tests.mock_raid_repository import MockRaidRepository
+from tests.mocks.mock_raid_repository import MockRaidRepository
 from thesheriff.application.raid.end_raid import EndRaid
 from thesheriff.domain.gang.gang import Gang
 from thesheriff.domain.outlaw.outlaw import Outlaw

tests/test_gang_list_gangs.py

@@ -1,4 +1,4 @@
-from tests.mock_gang_repository import MockGangRepository
+from tests.mocks.mock_gang_repository import MockGangRepository
 from thesheriff.application.gang.list_gangs import ListGangs
 
 

tests/test_grade_raid.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from tests.mock_outlaw_repository import MockOutlawRepository
+from tests.mocks.mock_outlaw_repository import MockOutlawRepository
 from thesheriff.application.raid.grade_raid import GradeRaid
 from thesheriff.domain.gang.gang import Gang
 from thesheriff.domain.raid.raid import Raid

tests/test_list_friends.py

@@ -1,4 +1,4 @@
-from tests.mock_outlaw_repository import MockOutlawRepository
+from tests.mocks.mock_outlaw_repository import MockOutlawRepository
 from thesheriff.application.outlaw.list_friends import ListFriends
 
 

tests/test_outlaw_list_gangs.py

@@ -1,4 +1,4 @@
-from tests.mock_gang_repository import MockGangRepository
+from tests.mocks.mock_gang_repository import MockGangRepository
 from thesheriff.application.outlaw.list_gangs import ListGangs
 
 

tests/test_rate_raid.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 
-from tests.mock_raid_repository import MockRaidRepository
-from tests.mock_outlaw_repository import MockOutlawRepository
+from tests.mocks.mock_raid_repository import MockRaidRepository
+from tests.mocks.mock_outlaw_repository import MockOutlawRepository
 from thesheriff.application.outlaw.rate_raid import RateRaid
 from thesheriff.domain.gang.gang import Gang
 from thesheriff.domain.outlaw.sheriff import Sheriff

thesheriff/configuration.py

@@ -6,6 +6,7 @@
     Column, DateTime, Float, ForeignKey, Integer,  MetaData, Table, Text
 )
 from thesheriff.domain.gang.repository.gang_repository import GangRepository
+from thesheriff.domain.mail.notifier.mail_notifier import MailNotifier
 from thesheriff.domain.outlaw.repository.outlaw_repository import \
     OutlawRepository
 from thesheriff.domain.raid.repository.raid_repository import RaidRepository
@@ -15,6 +16,7 @@
     MySQLOutlawRepository
 from thesheriff.infrastructure.repository.mysql_raid_repository import \
     MySQLRaidRepository
+from thesheriff.infrastructure.mail.smtp_mail_notifier import SMTPMailNotifier
 
 METADATA = MetaData()
 
@@ -76,5 +78,6 @@ def config(binder: inject.Binder) -> None:
             application.config['DATABASE_URI'],
             application.config['METADATA'],
             application.config['OUTLAW_TABLE']))
+        binder.bind(MailNotifier, SMTPMailNotifier)
 
     inject.configure(config)

thesheriff/domain/gang/repository/gang_repository.py

@@ -13,7 +13,7 @@ def of_id(self, gang_id: int) -> Gang:
         pass
 
     @abc.abstractmethod
-    def add(self, new_gang: Gang) -> NoReturn:
+    def add(self, new_gang: Gang) -> int:
         pass
 
     @abc.abstractmethod

thesheriff/domain/outlaw/repository/outlaw_repository.py

@@ -13,7 +13,7 @@ def of_id(self, outlaw_id: int) -> Outlaw:
         pass
 
     @abc.abstractmethod
-    def add(self, new_outlaw: Outlaw) -> NoReturn:
+    def add(self, new_outlaw: Outlaw) -> int:
         pass
 
     @abc.abstractmethod

thesheriff/infrastructure/controllers/gang_controller.py

@@ -1,7 +1,7 @@
 import json
 
 import inject
-from flask import Blueprint, jsonify, Response, request, make_response
+from flask import Blueprint, jsonify, Response, request
 
 from thesheriff.application.gang.list_gangs import ListGangs
 from thesheriff.application.gang.request.create_gang_request import \
@@ -117,8 +117,11 @@ def create_gang_endpoint() -> Response:
                                          new_gang.get('name'))
         gang = create_gang.execute(gang_request)
 
-        gang_json = json.dumps(gang.__dict__)
-        resp = make_response(gang_json, 201)
-        return resp
+        result = dict({'id': gang.id, 'name': gang.name,
+                       'owner_id': gang.owner_id})
+
+        message = {'status': 201, 'gang created': result}
+
+        return jsonify(message)
 
     return blueprint_gang

thesheriff/infrastructure/controllers/outlaw_controller.py

@@ -143,10 +143,13 @@ def create_outlaw_endpoint() -> Response:
         # TODO(all): if outlaw is None we should return an HTTP error
         new_outlaw = data.get('outlaw')
 
-        create_outlaw.execute(CreateOutlawRequest(
+        outlaw = create_outlaw.execute(CreateOutlawRequest(
             new_outlaw.get('name'), new_outlaw.get('email')))
 
-        message = {'status': 201, 'message': 'Outlaw added successfully'}
+        result = dict({'id': outlaw.id, 'name': outlaw.name,
+                       'email': outlaw.email})
+
+        message = {'status': 201, 'outlaw created': result}
 
         return jsonify(message)
 

thesheriff/infrastructure/controllers/raid_controller.py

@@ -4,10 +4,9 @@
 
 This module implements the RESTful part of the Raid use cases.
 """
-import json
 
 import inject
-from flask import Blueprint, Response, request, make_response
+from flask import Blueprint, Response, request, jsonify
 
 from thesheriff.application.outlaw.rate_raid import RateRaid
 from thesheriff.application.raid.create_raid import CreateRaid
@@ -85,9 +84,13 @@ def create_raid() -> Response:
 
         raid = create_raid.execute(raid_request)
 
-        raid_json = json.dumps(raid.__dict__)
-        resp = make_response(raid_json, 201)
-        return resp
+        result = dict({'id': raid.id, 'name': raid.name, 'date': raid.date,
+                       'location': raid.location, 'gang_id': raid.gang.id,
+                       'sheriff_id': raid.sheriff.id, 'outlaws': raid.outlaws})
+
+        message = {'status': 201, 'gang created': result}
+
+        return jsonify(message)
 
     @blueprint_raid.route("/outlaw/<int:outlaw_id>/raid/<int:raid_id>/",
                           methods=['PUT'])
@@ -104,7 +107,9 @@ def rate_raid(outlaw_id: int, raid_id: int) -> Response:
         rate = data.get('rate')
         score = Score(**rate)
         rate_raid.execute(outlaw_id, raid_id, score)
-        message = {'message': 'rated successfully'}
-        return make_response(message, 204)
+
+        message = {'status': 204, 'message': 'rated successfully'}
+
+        return jsonify(message)
 
     return blueprint_raid

thesheriff/infrastructure/repository/smtp_mail_repository.py → thesheriff/infrastructure/mail/smtp_mail_notifier.py

@@ -1,10 +1,10 @@
 import smtplib
 import ssl
-from thesheriff.domain.mail.repository.mail_notification \
-    import MailNotification
 
+from thesheriff.domain.mail.notifier.mail_notifier import MailNotifier
 
-class SMTPMailRepository:
+
+class SMTPMailNotifier(MailNotifier):
     global port  # For SSL
     global context
     global password
@@ -15,9 +15,6 @@ class SMTPMailRepository:
     # TODO(all): read the password from an environment variable
     password = "thesheriff123"
 
-    def __init__(self, mail_repository: MailNotification):
-        self.mail_repository = mail_repository
-
     def send(self, mail):
         with smtplib.SMTP_SSL("smtp.gmail.com", port, context=context) \
                 as server:

thesheriff/infrastructure/repository/mysql_gang_repository.py

@@ -64,7 +64,10 @@ def add(self, new_gang: Gang) -> NoReturn:
         """
         query = self.__gang_table.insert()\
             .values(owner_id=new_gang.owner_id, name=new_gang.name)
-        self.__connection.execute(query)
+        result = self.__connection.execute(query)
+        id = result.lastrowid
+        new_gang.id = id
+        return id
 
     def update(self, mod_gang: Gang) -> NoReturn:
         """Method update modifies existing Gang.

thesheriff/infrastructure/repository/mysql_outlaw_repository.py

@@ -36,7 +36,7 @@ def of_id(self, outlaw_id: int) -> Outlaw:
             self.__outlaw_table.c.id == outlaw_id)
         return self.__connection.execute(query)
 
-    def add(self, new_outlaw: Outlaw) -> NoReturn:
+    def add(self, new_outlaw: Outlaw) -> int:
         """Method add persists a new Outlaw to MySQL.
 
         :param new_outlaw: Object with the new Outlaw details
@@ -46,7 +46,10 @@ def add(self, new_outlaw: Outlaw) -> NoReturn:
         """
         query = self.__outlaw_table.insert().values(
             name=new_outlaw.name, email=new_outlaw.email)
-        self.__connection.execute(query)
+        result = self.__connection.execute(query)
+        id = result.lastrowid
+        new_outlaw.id = id
+        return id
 
     def update(self, mod_outlaw: Outlaw) -> NoReturn:
         """Method update modifies existing Outlaw.