fix(congregation): update source material when backup instead of over…

…write
sws2apps · Feb 26, 2023 · 46e3bc6 · 46e3bc6
1 parent 8323d9c
commit 46e3bc6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/features/backupRestore/BackupMain.jsx b/src/features/backupRestore/BackupMain.jsx
@@ -120,7 +120,7 @@ const BackupMain = ({ handleCreateBackup, handleClose, handleRestoreBackup, open
             <>
               {hasBackup && (
                 <Typography>
-                  {t('lastCongBackup', {
+                  {t(action === 'backup' ? 'lastCongBackup' : 'restoreConfirmation', {
                     backup_person: backup.by,
                     backup_date: dateFormat(new Date(backup.date), shortDateFormat),
                   })}

diff --git a/src/features/userAutoLogin/UserAutoLogin.jsx b/src/features/userAutoLogin/UserAutoLogin.jsx
@@ -81,6 +81,7 @@ const UserAutoLogin = () => {
           obj.cong_number = cong_number;
           obj.pocket_members = pocket_members;
           obj.cong_role = cong_role;
+          obj.account_type = 'vip';
           await dbUpdateAppSettings(obj);
           setPocketMembers(pocket_members);
           return;

diff --git a/src/indexedDb/dbUtility.js b/src/indexedDb/dbUtility.js
@@ -312,9 +312,12 @@ export const dbRestoreCongregationBackup = async (
 
   // restore source materials
   const oldSources = await appDb.src.toArray();
-  await appDb.src.clear();
   for await (const src of cong_sourceMaterial) {
-    await appDb.src.add(src, src.weekOf);
+    const isSrcExist = oldSources.find((source) => source.weekOf === src.weekOf);
+
+    if (!isSrcExist) {
+      await appDb.src.add(src, src.weekOf);
+    }
 
     // restore keepOverride if qualified
     const newKeepOverride = src.keepOverride || undefined;