CalvinBackup/notesnook-sync-server_customPrivateV1
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook-sync-server.git synced 2026-02-12 19:22:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync: rename Settings repository to LegacySettings

Browse Source
This commit is contained in:
Abdullah Atta
2024-03-05 10:20:23 +05:00
parent e7350e2c49
commit 36690c5472
4 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Notesnook.API/Accessors/SyncItemsRepositoryAccessor.cs
View File

@@ -32,7 +32,7 @@ namespace Notesnook.API.Accessors
public SyncItemsRepository<Relation> Relations { get; }
public SyncItemsRepository<Reminder> Reminders { get; }
public SyncItemsRepository<Content> Contents { get; }
public SyncItemsRepository<Setting> Settings { get; }
public SyncItemsRepository<Setting> LegacySettings { get; }
public SyncItemsRepository<Attachment> Attachments { get; }
public SyncItemsRepository<Color> Colors { get; }
public SyncItemsRepository<Tag> Tags { get; }
@@ -42,7 +42,7 @@ namespace Notesnook.API.Accessors
public SyncItemsRepositoryAccessor(SyncItemsRepository<Note> _notes,
SyncItemsRepository<Notebook> _notebooks,
SyncItemsRepository<Content> _content,
SyncItemsRepository<Setting> _settings,
SyncItemsRepository<Setting> _legacySettings,
SyncItemsRepository<Attachment> _attachments,
SyncItemsRepository<Shortcut> _shortcuts,
SyncItemsRepository<Relation> _relations,
@@ -56,6 +56,7 @@ namespace Notesnook.API.Accessors
Notes = _notes;
Contents = _content;
Settings = _settings;
LegacySettings = _legacySettings;
Attachments = _attachments;
UsersSettings = _usersSettings;
Monographs = _monographs;

10
Notesnook.API/Hubs/SyncHub.cs
View File

@@ -254,7 +254,7 @@ namespace Notesnook.API.Hubs
var settings = JsonSerializer.Deserialize<Setting>(data);
settings.Id = MongoDB.Bson.ObjectId.Parse(userId);
settings.ItemId = userId;
Repositories.Settings.Upsert(settings, userId, dateSynced);
Repositories.LegacySettings.Upsert(settings, userId, dateSynced);
break;
case "vaultKey":
userSettings.VaultKey = JsonSerializer.Deserialize<EncryptedData>(data);
@@ -339,7 +339,7 @@ namespace Notesnook.API.Hubs
if (settings == null) return 0;
settings.Id = MongoDB.Bson.ObjectId.Parse(userId);
settings.ItemId = userId;
Repositories.Settings.Upsert(settings, userId, dateSynced);
Repositories.LegacySettings.Upsert(settings, userId, dateSynced);
}
else
{
@@ -464,7 +464,7 @@ namespace Notesnook.API.Hubs
var chunks = PrepareChunks(
collections: new[] {
Repositories.Settings.FindItemsSyncedAfter,
Repositories.LegacySettings.FindItemsSyncedAfter,
Repositories.Attachments.FindItemsSyncedAfter,
Repositories.Notes.FindItemsSyncedAfter,
Repositories.Notebooks.FindItemsSyncedAfter,
@@ -526,7 +526,7 @@ namespace Notesnook.API.Hubs
Repositories.Notes.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
Repositories.Notebooks.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
Repositories.Contents.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
Repositories.Settings.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
Repositories.LegacySettings.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
Repositories.Shortcuts.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
Repositories.Reminders.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
Repositories.Relations.CountItemsSyncedAfterAsync(userId, lastSyncedTimestamp),
@@ -545,7 +545,7 @@ namespace Notesnook.API.Hubs
}
var collections = new[] {
Repositories.Settings.FindItemsSyncedAfter,
Repositories.LegacySettings.FindItemsSyncedAfter,
Repositories.Attachments.FindItemsSyncedAfter,
Repositories.Notes.FindItemsSyncedAfter,
Repositories.Notebooks.FindItemsSyncedAfter,

2
Notesnook.API/Interfaces/ISyncItemsRepositoryAccessor.cs
View File

@@ -32,7 +32,7 @@ namespace Notesnook.API.Interfaces
SyncItemsRepository<Reminder> Reminders { get; }
SyncItemsRepository<Relation> Relations { get; }
SyncItemsRepository<Content> Contents { get; }
SyncItemsRepository<Setting> Settings { get; }
SyncItemsRepository<Setting> LegacySettings { get; }
SyncItemsRepository<Attachment> Attachments { get; }
SyncItemsRepository<Color> Colors { get; }
SyncItemsRepository<Tag> Tags { get; }

14
Notesnook.API/Services/UserService.cs
View File

@@ -167,18 +167,7 @@ namespace Notesnook.API.Services
{
var cc = new CancellationTokenSource();
Repositories.Notes.DeleteByUserId(userId);
Repositories.Notebooks.DeleteByUserId(userId);
Repositories.Shortcuts.DeleteByUserId(userId);
Repositories.Contents.DeleteByUserId(userId);
Repositories.Settings.DeleteByUserId(userId);
Repositories.Attachments.DeleteByUserId(userId);
Repositories.Reminders.DeleteByUserId(userId);
Repositories.Relations.DeleteByUserId(userId);
Repositories.Colors.DeleteByUserId(userId);
Repositories.Tags.DeleteByUserId(userId);
Repositories.UsersSettings.Delete((u) => u.UserId == userId);
Repositories.Monographs.DeleteMany((m) => m.UserId == userId);
Repositories.LegacySettings.DeleteByUserId(userId);
if (!Constants.IS_SELF_HOSTED)
{
@@ -215,6 +204,7 @@ namespace Notesnook.API.Services
Repositories.Shortcuts.DeleteByUserId(userId);
Repositories.Contents.DeleteByUserId(userId);
Repositories.Settings.DeleteByUserId(userId);
Repositories.LegacySettings.DeleteByUserId(userId);
Repositories.Attachments.DeleteByUserId(userId);
Repositories.Reminders.DeleteByUserId(userId);
Repositories.Relations.DeleteByUserId(userId);