Final commit for stage 2

CSSE6400 · Apr 10, 2024 · 245bfb8 · 245bfb8
1 parent 2a01824
commit 245bfb8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 46 deletions.
diff --git a/requirements.txt b/requirements.txt
diff --git a/spamoverflow/views/routes.py b/spamoverflow/views/routes.py
@@ -199,16 +199,8 @@ def create_email(customer_id):
 @api.route('/customers/<string:customer_id>/reports/actors', methods=['GET'])
 def get_actors(customer_id):
     try:
-        #actors = Email.query.filter_by(customer_id=customer_id, malicious=True).group_by(Email.email_from).all()
         actors = db.session.query(Email.email_from, func.count(Email.id)).filter_by(customer_id=customer_id, malicious=True).group_by(Email.email_from).all()
 
-        #actors_data = []
-        #for actor in actors:
-         #   actor_data = {
-          #      'id': actor.email_from,
-           #     'count': Email.query.filter_by(customer_id=customer_id, email_from=actor.email_from, malicious=True).count()
-            #}
-            #actors_data.append(actor_data)
         actors_data = [{'id': actor[0], 'count': actor[1]} for actor in actors]
         report = {
             'generated_at': datetime.utcnow().isoformat() + 'Z',
@@ -225,16 +217,7 @@ def get_actors(customer_id):
 @api.route('/customers/<string:customer_id>/reports/domains', methods=['GET'])
 def get_domains(customer_id):
     try:
-        #domains = Email.query.filter_by(customer_id=customer_id, malicious=True).group_by(Email.domains).all()
         domains = db.session.query(Email.domains, func.count(Email.id)).filter_by(customer_id=customer_id, malicious=True).group_by(Email.domains).all()
-
-        #domains_data = []
-        #for domain in domains:
-        #    domain_data = {
-         #       'id': domain.domains,
-          #      'count': Email.query.filter_by(customer_id=customer_id, domains=domain.domains, malicious=True).count()
-           # }
-            #domains_data.append(domain_data)
 
         domains_data = [{'id': domain[0], 'count': domain[1]} for domain in domains]
         report = {
@@ -253,16 +236,7 @@ def get_domains(customer_id):
 @api.route('/customers/<string:customer_id>/reports/recipients', methods=['GET'])
 def get_recipients(customer_id):
     try:
-        #recipients = Email.query.filter_by(customer_id=customer_id, malicious=True).group_by(Email.to).all()
         recipients = db.session.query(Email.to, func.count(Email.id)).filter_by(customer_id=customer_id, malicious=True).group_by(Email.to).all()
-
-        #recipients_data = []
-        #for recipient in recipients:
-         #   recipient_data = {
-          #      'id': recipient.to,
-           #     'count': Email.query.filter_by(customer_id=customer_id, to=recipient.to, malicious=True).count()
-            #}
-            #recipients_data.append(recipient_data)
 
         recipients_data = [{'id': recipient[0], 'count': recipient[1]} for recipient in recipients]
         report = {