adjust app sync flow

WBG-Coach · Sep 18, 2023 · 1f9de33 · 1f9de33
1 parent d71b08d
commit 1f9de33
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/screens/SyncDetails/index.tsx b/src/screens/SyncDetails/index.tsx
@@ -21,7 +21,9 @@ const SyncDetails: React.FC = () => {
   useEffect(() => {
     if (isConnected) {
       setIsLoading(true);
-      SyncService.trySyncData().then(() => setIsLoading(false));
+      SyncService.trySyncData()
+        .then(() => setIsLoading(false))
+        .finally(() => setIsLoading(false));
     }
   }, [isConnected]);
 

diff --git a/src/services/sync.service.ts b/src/services/sync.service.ts
@@ -23,6 +23,7 @@ const SyncService = {
     pendingSessions: number;
   }> => {
     const db = await getDBConnection();
+
     const results = await db.executeSql(`
         SELECT
             (SELECT COUNT(*) FROM teacher where _status != 'synced') AS pendingTeachers,
@@ -49,7 +50,7 @@ const SyncService = {
     const lastSync = await StorageService.getLastSync();
 
     const response = await axios.post<SyncData>(
-      'https://api-sl.coachdigital.org/sync',
+      'https://29b5-177-208-184-177.ngrok-free.app/sync',
       {
         changes,
         lastSync,
@@ -58,7 +59,7 @@ const SyncService = {
         deviceId: await DeviceInfo.getUniqueId(),
         ...(await GeolocationService.getLocation()),
       },
-      {headers: {token: currentSchool?.key}},
+      {headers: {token: currentSchool?.schoolKey}},
     );
 
     if (response.status !== 200) {

diff --git a/src/types/school.ts b/src/types/school.ts
@@ -5,7 +5,7 @@ export type School = {
   name: string;
   emis_number: string;
 
-  key?: string;
+  schoolKey?: string;
   created_at: Date;
   updated_at: Date;
   teachersCount: number;