get my curriculum backend

client/App.js

@@ -32,7 +32,7 @@ export default function App() {
 
         try {
           // login user in backend
-          let response = await fetch('http://70eb11ac4839.ngrok.io/rest-auth/google/', {
+          let response = await fetch('http://145636c98edd.ngrok.io/rest-auth/google/', {
             method: 'POST',
             headers: {
               'content-type': 'application/json'
@@ -53,7 +53,7 @@ export default function App() {
           const token = await SecureStore.getItemAsync('token')
 
           // storing our id
-          let id = await fetch('http://70eb11ac4839.ngrok.io/api/get_user_id', {
+          let id = await fetch('http://145636c98edd.ngrok.io/api/get_user_id', {
             method: 'GET',
             headers: {
               'content-type': 'application/json',

client/Screens/AddTakenCourse.js

@@ -51,7 +51,7 @@ const AddTakenCourse = () => {
 
       let response = await axios({
         method: 'POST',
-        url: 'http://70eb11ac4839.ngrok.io/api/add_taken_course',
+        url: 'http://145636c98edd.ngrok.io/api/add_taken_course',
         headers: {
           'content-type': 'application/json',
           Authorization: `Token ${token}`
@@ -85,7 +85,7 @@ const AddTakenCourse = () => {
       const token = await SecureStore.getItemAsync('token')
       const response = await axios({
           method: 'GET',
-          url: `http://70eb11ac4839.ngrok.io/api/find_course?code=${text}`,
+          url: `http://145636c98edd.ngrok.io/api/find_course?code=${text}`,
           headers: {
             'content-type': 'application/json',
             Authorization: `Token ${token}`
@@ -172,6 +172,7 @@ const AddTakenCourse = () => {
                     onValueChange={(itemValue, itemIndex) => setSemester(itemValue) }>
                     <Picker.Item label="1" value="1" />
                     <Picker.Item label="2" value="2" />
+                    <Picker.Item label="3" value="3" />
                 </Picker>
             </View>
            <View style={{flex: 1, justifyContent: 'center'}}>

client/Screens/HomeScreen.js

@@ -11,7 +11,7 @@ function HomeScreen({ navigation }) {
     console.log(token, id)
 
     let response = await Axios({
-      url: 'http://70eb11ac4839.ngrok.io/api/hello',
+      url: 'http://145636c98edd.ngrok.io/api/hello',
       method: 'GET',
       headers: {
           Authorization: `Token ${token}`

client/Screens/SettingScreen.js

@@ -15,7 +15,7 @@ export default function SettingScreen() {
         let user_id = parseInt(id)
 
        try {
-        let response = await axios(`http://70eb11ac4839.ngrok.io/api/get_faculty_name?id=${user_id}`, {
+        let response = await axios(`http://145636c98edd.ngrok.io/api/get_faculty_name?id=${user_id}`, {
             method: 'GET',
             headers: {
                 'content-type': 'application/json',
@@ -43,7 +43,7 @@ export default function SettingScreen() {
         try {
             let response = await axios({
                 method: 'PATCH',
-                url: 'http://70eb11ac4839.ngrok.io/api/update_faculty',
+                url: 'http://145636c98edd.ngrok.io/api/update_faculty',
                 headers: {
                     Authorization: `Token ${token}`
                 },

server/CompanionApp/urls.py

@@ -16,6 +16,8 @@ urlpatterns = [
     url('api/find_course', views.findCourse),
     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_faculty_name', views.getFacultyUser),
+    url('api/get_all_courses_user_has_taken', views.getAllCoursesUserHasTaken),
+    url('api/get_all_courses_by_semester', views.getAllCoursesBySemester)
 ]
 

server/CompanionApp/views.py

@@ -209,6 +209,40 @@ def getFacultyUser(request):
         facultyName = cursor.fetchone()
         return JsonResponse({'FacultyName': facultyName}, status=status.HTTP_200_OK)
 
+@api_view(['GET'])
+def getAllCoursesUserHasTaken(request):
+    if request.method == 'GET':
+        user_id = int(request.query_params['user_id'])
+        cursor = connection.cursor()
+        cursor.execute(f'SELECT c.name, c.code, c.creditos, m.user_id_id, m.year, m.semestre, m.grade FROM "CompanionApp_curso" c INNER JOIN "CompanionApp_matricula" m ON (c.id = m.course_id_id) where m.user_id_id = {user_id} and m.grade <> \'N%\' order by m.year ASC, m.semestre ASC')
+        fetchCourses = cursor.fetchall()
+        courses = []
+        # convert courses to an array of objects
+        for i in range(0, len(fetchCourses)):
+            dic = {'name': fetchCourses[i][0], 'code': fetchCourses[i][1], 'creditos': fetchCourses[i][2], 'year': fetchCourses[i][4], 'semestre': fetchCourses[i][5], 'grade': fetchCourses[i][6]}
+            courses.append(dic)
+
+        return JsonResponse({'list': courses}, status=status.HTTP_200_OK)
+
+@api_view(['GET'])
+def getAllCoursesBySemester(request):
+    if request.method == 'GET': 
+        user_id = int(request.query_params['user_id'])
+        year = int(request.query_params['year'])
+        semestre = int(request.query_params['semestre'])
+        cursor = connection.cursor()
+        cursor.execute(f'SELECT c.name, c.code, c.creditos, m.user_id_id, m.year, m.semestre, m.grade FROM "CompanionApp_curso" c INNER JOIN "CompanionApp_matricula" m ON (c.id = m.course_id_id) where m.user_id_id = {user_id} and m.year = {year} and m.semestre = {semestre} and m.grade <> \'N%\' ')
+        fetchCourses = cursor.fetchall()
+        courses = []
+
+        # convert courses to an array of objects
+        for i in range(0, len(fetchCourses)):
+            dic = {'name': fetchCourses[i][0], 'code': fetchCourses[i][1], 'creditos': fetchCourses[i][2], 'year': fetchCourses[i][4], 'semestre': fetchCourses[i][5], 'grade': fetchCourses[i][6]}
+            courses.append(dic)
+            
+        return JsonResponse({'list': courses}, status=status.HTTP_200_OK)
+
+
 
 @api_view(['GET', 'POST'])
 def hello_world(request):