From 245bfb80e47f0b5875e8c020a626f5a55dbaa0cd Mon Sep 17 00:00:00 2001
From: Manav Trivedi <trivedimanav2003@gmail.com>
Date: Wed, 10 Apr 2024 21:45:52 +1000
Subject: [PATCH] Final commit for stage 2

---
 requirements.txt             | 20 --------------------
 spamoverflow/views/routes.py | 26 --------------------------
 2 files changed, 46 deletions(-)
 delete mode 100644 requirements.txt

diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index c27e8e5..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-blinker==1.7.0
-click==8.1.7
-Flask==3.0.2
-Flask-SQLAlchemy==3.1.1
-greenlet==3.0.3
-itsdangerous==2.1.2
-Jinja2==3.1.3
-MarkupSafe==2.1.5
-pendulum==3.0.0
-postgres==4.0
-psycopg2==2.9.9
-psycopg2-binary==2.9.9
-psycopg2-pool==1.2
-python-dateutil==2.9.0.post0
-SQLAlchemy==2.0.28
-SQLAlchemy-Utils==0.41.1
-time-machine==2.14.1
-typing_extensions==4.10.0
-tzdata==2024.1
-Werkzeug==3.0.1
diff --git a/spamoverflow/views/routes.py b/spamoverflow/views/routes.py
index 2c91296..46e9388 100644
--- 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 = {