New avid

map_project/api/admin.py

@@ -1,3 +1,6 @@
 from django.contrib import admin
-
+from .models import BusAlert, SignUp
 # Register your models here.
+
+admin.site.register(BusAlert)
+admin.site.register(SignUp)

map_project/api/migrations/0006_alter_busalert_busname_alter_busalert_busnumber_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.1.3 on 2022-11-06 09:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0005_alter_busalert_busname_alter_busalert_busnumber_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='busalert',
+            name='busname',
+            field=models.CharField(default='', max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='busalert',
+            name='busnumber',
+            field=models.CharField(default='', max_length=3),
+        ),
+        migrations.AlterField(
+            model_name='signup',
+            name='email',
+            field=models.EmailField(max_length=254),
+        ),
+    ]

map_project/api/migrations/0007_alter_signup_time.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.3 on 2022-11-06 09:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0006_alter_busalert_busname_alter_busalert_busnumber_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='signup',
+            name='time',
+            field=models.TimeField(auto_now=True),
+        ),
+    ]

map_project/api/migrations/0008_alter_signup_favourites.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.3 on 2022-11-06 14:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0007_alter_signup_time'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='signup',
+            name='favourites',
+            field=models.CharField(default='', max_length=500),
+        ),
+    ]

map_project/api/models.py

@@ -1,6 +1,10 @@
 from django.db import models
 import string, random
 import json
+from django.core.mail import send_mail
+from threading import Thread
+import time
+
 
 # Create your models here.
 def jsonReader():
@@ -29,6 +33,69 @@ def jsonReader():
     print(PopulatedDict)
     return PopulatedDict
 
+def jsonReadPreferences(preferences):
+    preferenceList = preferences.split(",")
+    PopulatedDict = {}
+    with open("./Alerts.json") as rawOpen:
+        Data = json.load(rawOpen)
+        for i in Data:
+            if Data[i] in preferenceList:
+                # print(preferences)
+                for y in Data[i]:
+                    #print(y)
+                    linkIndex = (y).find("<")
+                    #print(linkIndex)
+                    if linkIndex != -1:
+                        #print(i in PopulatedDict.keys())
+                        if ((i in PopulatedDict.keys()) == False):
+                            PopulatedDict[i] = [(str(y))[0:linkIndex]]
+                            #print("THIS RAN")
+                        else:
+                            PopulatedDict[i].append((str(y))[0:linkIndex])
+                    else:
+                        if ((i in PopulatedDict.keys()) == False):
+                            PopulatedDict[i] = [str(y)]
+                        else:
+                            PopulatedDict[i].append(str(y))
+    print(PopulatedDict)
+    return PopulatedDict
+
+def emailPerson(subject,message,otherEmail):
+    send_mail(subject,message,"[email protected]",[str(otherEmail)],fail_silently=False)
+    print("Email Delivered")
+
+def EmailTimer():
+    while(True):
+        emailALL()
+        print("cycle complete")
+        time.sleep(43200) # 12 hours --> 43200
+
+def StartTimer():
+    t2 = Thread(target=EmailTimer)
+    t2.daemon = True
+    t2.start()
+    print("TIMER STARTING")
+
+
+def emailALL():
+    profileCount = (SignUp.objects.all()).count()
+    for i in range(profileCount):
+        favoriteList = getattr(SignUp.objects.all()[i],"favourites")
+        favoriteList = favoriteList.split(",") # --> ['line 1', 'bus 1', 'bus 50']
+        # personalized = jsonReader()#jsonReadPreferences(getattr(SignUp.objects.all()[i],"favourites"))
+        print(favoriteList)
+        alertinfo = AlertInfo()
+        string = f''
+        for b in favoriteList:
+            string += "\n" + alertinfo.getmessage(b)
+        print(string)
+
+        if not string:
+            emailPerson("STATUS UPDATE", "No Alert Messages!",getattr(SignUp.objects.all()[i],"email"))
+        else:
+            emailPerson("STATUS UPDATE", string ,getattr(SignUp.objects.all()[i],"email"))
+        #display info
+
 class BusAlert(models.Model):
     busnumber = models.CharField(max_length=3, default='')
     busname = models.CharField(max_length=50, default='')
@@ -37,8 +104,9 @@ class BusAlert(models.Model):
 
 class SignUp(models.Model):
     email = models.EmailField()
-    favourites = models.CharField(max_length=8, null=True, blank=True)
-    time = models.TimeField(auto_now=False, auto_now_add=False)
+    favourites = models.CharField(max_length=500, default = "")
+    time = models.TimeField(auto_now=True, auto_now_add=False)
+
 
 
 class AlertInfo:
@@ -55,8 +123,20 @@ def getNumber(self, bus: str) -> str:
         elif bus[0] == 'L':
             return bus[4:]
 
-    def getName(self, bus: str) -> str:
-        message = self.alertdict[bus]
-        index = message.find(':')
+    def getmessage(self, bus: str):
+        if bus in self.alertdict:
+            print(self.alertdict)
+            message = self.alertdict[bus]
+            a = f''
+            for i in message:
+                a += i
+                a += '\n'
+            message = a
+        else:
+            message = ''
+        return message
+
+
 
-        return message[:index]
+# class Users:
+#     def __init__

map_project/api/urls.py

@@ -1,7 +1,10 @@
 from .views import BusAlertAPIView, SignUpAPIView
 from django.urls import path
+from .models import BusAlert, SignUp, emailPerson, jsonReadPreferences, emailALL, EmailTimer,StartTimer
 
 urlpatterns = [
     path('BusAlert', BusAlertAPIView.as_view()),
     path('SignUp', SignUpAPIView.as_view()),
-]
+]
+
+StartTimer()

map_project/api/views.py

@@ -1,5 +1,5 @@
 from rest_framework import generics, status
-from .models import BusAlert, SignUp
+from .models import BusAlert, SignUp, emailPerson, jsonReadPreferences, emailALL, EmailTimer,StartTimer
 from .serializers import BusAlertSerializer, SignUpCreateSerializer
 from rest_framework.response import Response
 
@@ -19,5 +19,27 @@ def get(self, request, *args, **kwargs):
 
 
 class SignUpAPIView(generics.CreateAPIView):
-    queryset = SignUpCreateSerializer
-    serializer_class = SignUpCreateSerializer
+    serializer_class = SignUpCreateSerializer
+    # if Started == False:
+    #     emailALL()
+    #     Started == True
+    def get_queryset(self):
+        signups = SignUp.objects.all()
+        return signups
+
+    def post(self, request, *args, **kwargs):
+
+        signups_data = request.data 
+
+        new_signup = SignUp.objects.create(email=signups_data["email"], favourites=signups_data["favourites"],)
+
+        new_signup.save()
+
+
+        serializer = SignUpCreateSerializer(new_signup)
+
+        return Response(serializer.data)
+
+
+    # def display_model_fields(model):
+    #     print(getattr(new_))

map_project/manage.py

@@ -5,6 +5,7 @@
 from scrape import runScrape
 from subprocess import call
 from threading import Thread
+#from api.models import emailALL,EmailTimers
 import requests
 import time
 
@@ -34,5 +35,8 @@ def startScraping():
     t1 = Thread(target=startScraping)
     t1.daemon = True
     t1.start()
+    # t2 = Thread(target = emailALL)
+    # t2.daemon = True
+    # t2.start()
     #startScraping()
     main()