added all courses to ProxSemestre

organizar/organizar.py

@@ -1,11 +1,14 @@
 import os, sys
 import json
 
-path1 = "C:/Users/diego/Documents/companion_app_gh/primer_sem"
-path2 = "C:/Users/diego/Documents/companion_app_gh/segundo_sem"
+
+path1 = "C:/Users/diego/Documents/companion_app/primer_sem"
+path2 = "C:/Users/diego/Documents/companion_app/segundo_sem"
+path3 = "C:/Users/diego/Documents/companion_app/Miupi Parser"
 
 dirs1 = os.listdir(path1)
 dirs2 = os.listdir(path2)
+dirs3 = os.listdir(path3)
 
 def orderFiles1(files1):
     i = 1
@@ -30,10 +33,21 @@ def orderFiles3(files1, files2, files3):
         files3.append({'file': files2[i]['file'], 'num': files1[i]['num']})
     return files3
 
+
+def orderFilesProxSemestre(files):
+    """ 
+    Organizing all the files from Miupi Parser to a single array. The array will contain each directory of each file
+    """
+    i = 1
+    for file in dirs3:
+        if file.endswith('.json'):
+            files.append({'file': file, 'num': i})
+            i += 1 # parse.py esta entre medio
+    return files
+
 files1 = orderFiles1([])
 files2 = orderFiles2([])
 files3 = []
 files3 = orderFiles3(files1, files2, files3)
-
-
+proxSemFiles = orderFilesProxSemestre([])
 

server/CompanionApp/migrations/0015_auto_20201208_1214.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.8 on 2020-12-08 16:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('CompanionApp', '0014_auto_20201207_1613'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='proximosemestre',
+            name='code',
+            field=models.CharField(max_length=15),
+        ),
+    ]

server/CompanionApp/models.py

@@ -37,7 +37,7 @@ class Matricula(models.Model):
 class ProximoSemestre(models.Model):
     course_id = models.ForeignKey(Curso, on_delete=models.CASCADE, default=1)
     name = models.CharField(max_length=150)
-    code = models.CharField(max_length=9)
+    code = models.CharField(max_length=15)
     creditos = models.IntegerField(default=0)
     section = models.CharField(max_length=5, null=True, blank=True)
     prof = models.CharField(max_length=150, null=True, blank=True)

server/CompanionApp/urls.py

@@ -12,13 +12,14 @@ urlpatterns = [
     url(r'^api/hello$', views.hello_world),
     url(r'^api/insertar_cursos$', views.insertarTodosLosCursos),
     url(r'^api/update_faculty$', views.updateFaculty),
-    # url(r'^api/find_course$', views.findCourse),
     url('api/find_course', views.findCourse),
+    url('api/select_course_prox_semestre', views.selectCourseProxSemestre),
     url(r'^api/add_taken_course$', views.addTakenCourse),
     url(r'^api/get_user_id$', views.getUserId),
     url('api/get_faculty_name', views.getFacultyUser),
     url('api/get_all_courses_user_has_taken', views.getAllCoursesUserHasTaken),
     url('api/get_all_courses_by_semester', views.getAllCoursesBySemester),
-    url('api/see_gpa', views.seeGPA)
+    url('api/see_gpa', views.seeGPA),
+    url('api/insertar_prox_sem_cursos', views.insertarTodosLosCursosProxSemestre)
 ]
 

server/CompanionApp/views.py

@@ -3,7 +3,7 @@ import json
 sys.path.insert(1,'C:/Users/diego/Documents/companion_app/organizar/')
 
 
-from organizar import files3
+from organizar import files3, proxSemFiles
 
 
 from rest_auth.registration.views import SocialLoginView
@@ -15,7 +15,7 @@ from django.http.response import JsonResponse
 from rest_framework.parsers import JSONParser 
 from rest_framework import status
  
-from .models import Facultad, Curso
+from .models import Facultad, Curso, ProximoSemestre
 from .serializers import FacultadSerializer, CursoSerializer
 from rest_framework.decorators import api_view
 
@@ -91,6 +91,49 @@ def insertarTodosLosCursos(request):
                                 i += 1
         return JsonResponse({'message': 'se insertaron todos los cursos'}, status=status.HTTP_201_CREATED)
 
+@api_view(['POST',])
+def insertarTodosLosCursosProxSemestre(request):
+    if request.method == 'POST': 
+        for file in proxSemFiles:
+            path = "C:/Users/diego/Documents/companion_app/Miupi Parser"
+            with open(path + '/' + file['file']) as f:
+                data = json.load(f)
+                fac_id = file["num"] # this id comes from the file organizar. If the course does not exist in table Curso, use this id
+                for course in data:
+                    name = course["Nombre"]
+                    code = course["Curso"]
+                    creditos = int(course["Creditos"])
+                    section = course["Seccion"]
+                    prof = course["Profesor"]
+                    hours = course["Horario"]
+                    days = course["Dias"]
+                    rooms = course["Salones"]
+
+
+                    # seeing if course from json file already exists in table Curso
+                    cursor = connection.cursor()
+                    cursor.execute(f'SELECT id from "CompanionApp_curso" where code = \'{code}\'')
+                    course_id = cursor.fetchone()
+
+                    # if course does not exist in table Curso, create the course in table Course and create the course in table ProximoSemestre
+                    if course_id == None:
+                        # create course
+                        cursor = connection.cursor()
+                        cursor.execute(f'INSERT INTO "CompanionApp_curso" (name, code, creditos, fac_id_id) VALUES (\'{name}\', \'{code}\', {creditos}, {fac_id})')
+                        
+                         # seeing again if course from json file already exists in table Curso to fetch course_id
+                        cursor = connection.cursor()
+                        cursor.execute(f'SELECT id from "CompanionApp_curso" where code = \'{code}\'')
+                        course_id = cursor.fetchone()
+                       
+                  
+                    # insert course to the table ProxSemestre
+                    course_id = course_id[0]
+                    cursor = connection.cursor()
+            
+                    cursor.execute(f'INSERT INTO "CompanionApp_proximosemestre" (name, code, creditos, section, prof, hours, days, rooms, course_id_id) VALUES (\'{name}\', \'{code}\', {creditos}, \'{section}\', \'{prof}\', \'{hours}\', \'{days}\', \'{rooms}\', {course_id})')
+          
+        return JsonResponse({'message': 'se insertaron todos los cursos'}, status=status.HTTP_201_CREATED)
 
 
 @api_view(['PATCH',])
@@ -121,8 +164,17 @@ def findCourse(request):
         courses = list(courses.values())
         return JsonResponse({'list': courses}, status=status.HTTP_200_OK)
 
+# find courses in our ProximoSemestre table
+@api_view(['GET',])
+def selectCourseProxSemestre(request):
+    if request.method == 'GET':
+        course_code = request.query_params['code'].upper()
+        courses = ProximoSemestre.objects.filter(code__contains=course_code)[:10]
+        courses = list(courses.values())
+        return JsonResponse({'list': courses}, status=status.HTTP_200_OK)
+
 
-@api_view(['POST'])
+@api_view(['POST',])
 def addTakenCourse(request):
     if request.method == 'POST':
         # request params