Refactored types for better readability

src/routes/Home/Home.tsx

@@ -8,9 +8,10 @@ import GetDistance from "../../components/GetDistance/GetDistance";
 import Button from "../../components/Button/Button";
 import {
   RootDrawerParamList,
-  StudentStatusParams,
+  StudentStatusReturnType,
+  LocationType,
+  StudentStatusType,
 } from "../../interfaces/Interfaces";
-import { LocationType } from "../../interfaces/Interfaces";
 import { useNavigation } from "@react-navigation/native";
 import {
   GetStudentStatus,
@@ -104,8 +105,14 @@ export default function Home() {
   const [buttonLabel, setButtonLabel] = useState("Start studying");
   const StudentStatus = useQuery({
     queryKey: ["user_status"],
-    queryFn: GetStudentStatus,
-    onSuccess: (data: StudentStatusParams) => {
+    queryFn: async () => {
+      const data = await GetStudentStatus();
+      if (data[0] == false) {
+        return Promise.reject(new Error());
+      }
+      return data;
+    },
+    onSuccess: (data: StudentStatusReturnType) => {
       if (data[1].active !== undefined) {
         setStudying(data[1].active);
       }
@@ -125,7 +132,13 @@ export default function Home() {
   });
 
   const mutation = useMutation({
-    mutationFn: PatchStudentStatus,
+    mutationFn: async (info: StudentStatusType) => {
+      const data = await PatchStudentStatus(info);
+      if (data[0] != true) {
+        return Promise.reject(new Error());
+      }
+      return data;
+    },
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ["user"] });
       queryClient.invalidateQueries({ queryKey: ["user_status"] });

src/routes/Onboarding/Onboarding.tsx

@@ -3,10 +3,10 @@ import styles from "../../styles";
 import { View, Text } from "react-native";
 import { useNavigation } from "@react-navigation/native";
 import {
-  Course,
   RootDrawerParamList,
-  Semester,
-  YearLevel,
+  CourseType,
+  SemesterType,
+  YearLevelType,
 } from "../../interfaces/Interfaces";
 import { colors } from "../../styles";
 import { MotiView } from "moti";
@@ -18,12 +18,11 @@ import {
   GetCourses,
   GetSemesters,
   GetYearLevels,
-  OnboardingUpdateStudentInfo,
+  PatchUserInfo,
 } from "../../components/Api/Api";
 import { useDispatch } from "react-redux";
 import { unsetOnboarding } from "../../features/redux/slices/StatusSlice/StatusSlice";
 import { setUser } from "../../features/redux/slices/UserSlice/UserSlice";
-import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
 import AnimatedContainerNoScroll from "../../components/AnimatedContainer/AnimatedContainerNoScroll";
 import { useToast } from "react-native-toast-notifications";
 export default function Onboarding() {
@@ -42,7 +41,7 @@ export default function Onboarding() {
     queryKey: ["semesters"],
     queryFn: GetSemesters,
     onSuccess: (data) => {
-      let semesters = data[1].map((item: Semester) => ({
+      let semesters = data[1].map((item: SemesterType) => ({
         label: item.name,
         value: item.name,
       }));
@@ -68,7 +67,7 @@ export default function Onboarding() {
     queryKey: ["year_levels"],
     queryFn: GetYearLevels,
     onSuccess: (data) => {
-      let year_levels = data[1].map((item: YearLevel) => ({
+      let year_levels = data[1].map((item: YearLevelType) => ({
         label: item.name,
         value: item.name,
       }));
@@ -97,7 +96,7 @@ export default function Onboarding() {
     queryKey: ["courses"],
     queryFn: GetCourses,
     onSuccess: (data) => {
-      let courses = data[1].map((item: Course) => ({
+      let courses = data[1].map((item: CourseType) => ({
         label: item.name,
         value: item.name,
       }));
@@ -241,7 +240,7 @@ export default function Onboarding() {
               !selected_yearlevel || !selected_course || !selected_semester
             }
             onPress={async () => {
-              let result = await OnboardingUpdateStudentInfo({
+              let result = await PatchUserInfo({
                 semester: selected_semester,
                 course: selected_course,
                 year_level: selected_yearlevel,

src/routes/Register/Register.tsx

@@ -15,7 +15,6 @@ import { RootDrawerParamList } from "../../interfaces/Interfaces";
 import SignupIcon from "../../icons/SignupIcon/SignupIcon";
 import { UserRegister } from "../../components/Api/Api";
 import IsNumber from "../../components/IsNumber/IsNumber";
-import ParseError from "../../components/ParseError/ParseError";
 import AnimatedContainer from "../../components/AnimatedContainer/AnimatedContainer";
 import { useToast } from "react-native-toast-notifications";
 

src/routes/Revalidation/Revalidation.tsx

@@ -1,7 +1,7 @@
 import * as React from "react";
 import styles from "../../styles";
 import { View, Text, ActivityIndicator } from "react-native";
-import { TokenRefresh, UserInfo } from "../../components/Api/Api";
+import { TokenRefresh, GetUserInfo } from "../../components/Api/Api";
 import { useDispatch } from "react-redux";
 import { colors } from "../../styles";
 import { useEffect, useState } from "react";
@@ -25,7 +25,7 @@ export default function Revalidation() {
   useEffect(() => {
     setState("Previous session found");
     TokenRefresh().then(async (response) => {
-      let user_info = await UserInfo();
+      let user_info = await GetUserInfo();
       if (response && user_info[0]) {
         dispatch(login());
         dispatch(setUser(user_info[1]));

src/routes/StartStudying/StartStudying.tsx

@@ -3,13 +3,14 @@ import styles, { Viewport } from "../../styles";
 import { View, Text, ToastAndroid } from "react-native";
 import { useState } from "react";
 import {
-  UserInfoParams,
+  UserInfoReturnType,
   OptionType,
   RootDrawerParamList,
+  StudentStatusType,
 } from "../../interfaces/Interfaces";
 import Button from "../../components/Button/Button";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { PatchStudentStatus, UserInfo } from "../../components/Api/Api";
+import { PatchStudentStatus, GetUserInfo } from "../../components/Api/Api";
 import { colors } from "../../styles";
 import DropDownPicker from "react-native-dropdown-picker";
 import AnimatedContainerNoScroll from "../../components/AnimatedContainer/AnimatedContainerNoScroll";
@@ -30,8 +31,8 @@ export default function StartStudying({ route }: any) {
   const [subjects, setSubjects] = useState<OptionType[]>([]);
   const StudentInfo = useQuery({
     queryKey: ["user"],
-    queryFn: UserInfo,
-    onSuccess: (data: UserInfoParams) => {
+    queryFn: GetUserInfo,
+    onSuccess: (data: UserInfoReturnType) => {
       let subjects = data[1].subjects.map((subject: string) => ({
         label: subject,
         value: subject,
@@ -49,7 +50,13 @@ export default function StartStudying({ route }: any) {
   });
 
   const mutation = useMutation({
-    mutationFn: PatchStudentStatus,
+    mutationFn: async (info: StudentStatusType) => {
+      const data = await PatchStudentStatus(info);
+      if (data[0] == false) {
+        return Promise.reject(new Error("Error updating student status"));
+      }
+      return data;
+    },
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ["user"] });
       queryClient.invalidateQueries({ queryKey: ["user_status"] });

src/routes/SubjectsPage/SubjectsPage.tsx

@@ -3,15 +3,21 @@ import styles from "../../styles";
 import { View, Text } from "react-native";
 import { useState } from "react";
 import {
-  UserInfoParams,
-  SubjectParams,
-  Subject,
+  UserInfoReturnType,
+  SubjectsReturnType,
+  SubjectType,
   OptionType,
+  StudentStatusType,
 } from "../../interfaces/Interfaces";
 import Button from "../../components/Button/Button";
 import { Image } from "react-native";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { GetSubjects, PatchUserInfo, UserInfo } from "../../components/Api/Api";
+import {
+  GetSubjects,
+  PatchUserInfo,
+  GetUserInfo,
+  PatchStudentStatus,
+} from "../../components/Api/Api";
 import { colors } from "../../styles";
 import DropDownPicker from "react-native-dropdown-picker";
 import AnimatedContainerNoScroll from "../../components/AnimatedContainer/AnimatedContainerNoScroll";
@@ -23,6 +29,30 @@ export default function SubjectsPage() {
   const logged_in_user = useSelector((state: RootState) => state.user.user);
   const queryClient = useQueryClient();
   const toast = useToast();
+
+  // Student Status
+  const studentstatus_mutation = useMutation({
+    mutationFn: async (info: StudentStatusType) => {
+      const data = await PatchStudentStatus(info);
+      if (data[0] != true) {
+        return Promise.reject(new Error());
+      }
+      return data;
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["user"] });
+      queryClient.invalidateQueries({ queryKey: ["user_status"] });
+    },
+    onError: () => {
+      toast.show("An error has occured\nChanges have not been saved", {
+        type: "warning",
+        placement: "top",
+        duration: 2000,
+        animationType: "slide-in",
+      });
+    },
+  });
+
   // User Info
   const [user, setUser] = useState({
     first_name: "",
@@ -39,8 +69,8 @@ export default function SubjectsPage() {
   });
   const StudentInfo = useQuery({
     queryKey: ["user"],
-    queryFn: UserInfo,
-    onSuccess: (data: UserInfoParams) => {
+    queryFn: GetUserInfo,
+    onSuccess: (data: UserInfoReturnType) => {
       setUser({
         ...user,
         first_name: data[1].first_name,
@@ -69,7 +99,11 @@ export default function SubjectsPage() {
       queryClient.invalidateQueries({ queryKey: ["user"] });
       queryClient.invalidateQueries({ queryKey: ["subjects"] });
       setSelectedSubjects([]);
-      toast.show("Changes applied successfully", {
+      // Reset student status when changing user info to prevent bugs
+      studentstatus_mutation.mutate({
+        active: false,
+      });
+      toast.show("Changes applied successfully.\nStudent status reset", {
         type: "success",
         placement: "top",
         duration: 2000,
@@ -88,9 +122,9 @@ export default function SubjectsPage() {
     enabled: StudentInfo.isFetched,
     queryKey: ["subjects"],
     queryFn: GetSubjects,
-    onSuccess: (data: SubjectParams) => {
+    onSuccess: (data: SubjectsReturnType) => {
       if (data[1]) {
-        let subjects = data[1].map((subject: Subject) => ({
+        let subjects = data[1].map((subject: SubjectType) => ({
           label: subject.name,
           value: subject.name,
         }));

src/routes/UserInfoPage/UserInfoPage.tsx

@@ -10,15 +10,15 @@ import {
 } from "react-native";
 import { useState } from "react";
 import {
-  SemesterParams,
-  UserInfoParams,
-  Semester,
-  SubjectParams,
-  Subject,
-  YearLevel,
-  Course,
+  SemesterReturnType,
+  UserInfoReturnType,
+  SemesterType,
+  YearLevelType,
+  CourseType,
   OptionType,
-  Subjects,
+  StudentStatusType,
+  UserInfoType,
+  PatchUserInfoType,
 } from "../../interfaces/Interfaces";
 import Button from "../../components/Button/Button";
 import { Image } from "react-native";
@@ -26,11 +26,10 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import {
   GetCourses,
   GetSemesters,
-  GetSubjects,
   GetYearLevels,
   PatchStudentStatus,
   PatchUserInfo,
-  UserInfo,
+  GetUserInfo,
 } from "../../components/Api/Api";
 import { colors } from "../../styles";
 import DropDownPicker from "react-native-dropdown-picker";
@@ -52,16 +51,16 @@ export default function UserInfoPage() {
 
   // Student Status
   const studentstatus_mutation = useMutation({
-    mutationFn: PatchStudentStatus,
+    mutationFn: async (info: StudentStatusType) => {
+      const data = await PatchStudentStatus(info);
+      if (data[0] != true) {
+        return Promise.reject(new Error());
+      }
+      return data;
+    },
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ["user"] });
       queryClient.invalidateQueries({ queryKey: ["user_status"] });
-      toast.show("Student Status has been reset", {
-        type: "success",
-        placement: "top",
-        duration: 2000,
-        animationType: "slide-in",
-      });
     },
     onError: () => {
       toast.show("An error has occured\nChanges have not been saved", {
@@ -89,8 +88,8 @@ export default function UserInfoPage() {
   });
   const StudentInfo = useQuery({
     queryKey: ["user"],
-    queryFn: UserInfo,
-    onSuccess: (data: UserInfoParams) => {
+    queryFn: GetUserInfo,
+    onSuccess: (data: UserInfoReturnType) => {
       //  console.log(data[1]);
       setUser({
         ...user,
@@ -119,7 +118,13 @@ export default function UserInfoPage() {
   });
 
   const mutation = useMutation({
-    mutationFn: PatchUserInfo,
+    mutationFn: async (info: PatchUserInfoType) => {
+      const data = await PatchUserInfo(info);
+      if (data[0] == false) {
+        return Promise.reject(new Error());
+      }
+      return data;
+    },
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ["user"] });
       queryClient.invalidateQueries({ queryKey: ["subjects"] });
@@ -127,7 +132,7 @@ export default function UserInfoPage() {
       studentstatus_mutation.mutate({
         active: false,
       });
-      toast.show("Changes applied successfully", {
+      toast.show("Changes applied successfully.\nStudent status reset", {
         type: "success",
         placement: "top",
         duration: 2000,
@@ -152,8 +157,8 @@ export default function UserInfoPage() {
   const Semesters = useQuery({
     queryKey: ["semesters"],
     queryFn: GetSemesters,
-    onSuccess: (data: SemesterParams) => {
-      let semestersData = data[1].map((semester: Semester) => ({
+    onSuccess: (data: SemesterReturnType) => {
+      let semestersData = data[1].map((semester: SemesterType) => ({
         label: semester.name,
         value: semester.name,
         shortname: semester.shortname,
@@ -179,7 +184,7 @@ export default function UserInfoPage() {
     queryKey: ["year_levels"],
     queryFn: GetYearLevels,
     onSuccess: (data) => {
-      let year_levels = data[1].map((yearlevel: YearLevel) => ({
+      let year_levels = data[1].map((yearlevel: YearLevelType) => ({
         label: yearlevel.name,
         value: yearlevel.name,
       }));
@@ -203,7 +208,7 @@ export default function UserInfoPage() {
     queryKey: ["courses"],
     queryFn: GetCourses,
     onSuccess: (data) => {
-      let courses = data[1].map((course: Course) => ({
+      let courses = data[1].map((course: CourseType) => ({
         label: course.name,
         value: course.name,
       }));