mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 10:26:08 +01:00 
			
		
		
		
	refactoring
This commit is contained in:
		| @@ -6,7 +6,7 @@ const dateUtils = require('../services/date_utils'); | |||||||
| class ApiToken extends Entity { | class ApiToken extends Entity { | ||||||
|     static get tableName() { return "api_tokens"; } |     static get tableName() { return "api_tokens"; } | ||||||
|     static get primaryKeyName() { return "apiTokenId"; } |     static get primaryKeyName() { return "apiTokenId"; } | ||||||
|     static get syncedProperties() { return ["apiTokenId", "token", "dateCreated", "isDeleted"]; } |     static get hashedProperties() { return ["apiTokenId", "token", "dateCreated", "isDeleted"]; } | ||||||
|  |  | ||||||
|     beforeSaving() { |     beforeSaving() { | ||||||
|         super.beforeSaving(); |         super.beforeSaving(); | ||||||
|   | |||||||
| @@ -8,7 +8,8 @@ const sql = require('../services/sql'); | |||||||
| class Branch extends Entity { | class Branch extends Entity { | ||||||
|     static get tableName() { return "branches"; } |     static get tableName() { return "branches"; } | ||||||
|     static get primaryKeyName() { return "branchId"; } |     static get primaryKeyName() { return "branchId"; } | ||||||
|     static get syncedProperties() { return ["branchId", "noteId", "parentNoteId", "notePosition", "dateModified", "isDeleted", "prefix"]; } |     // notePosition is not part of hash because it would produce a lot of updates in case of reordering | ||||||
|  |     static get hashedProperties() { return ["branchId", "noteId", "parentNoteId", "dateModified", "isDeleted", "prefix"]; } | ||||||
|  |  | ||||||
|     async getNote() { |     async getNote() { | ||||||
|         return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]); |         return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]); | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ class Entity { | |||||||
|  |  | ||||||
|         let contentToHash = ""; |         let contentToHash = ""; | ||||||
|  |  | ||||||
|         for (const propertyName of this.constructor.syncedProperties) { |         for (const propertyName of this.constructor.hashedProperties) { | ||||||
|             contentToHash += "|" + this[propertyName]; |             contentToHash += "|" + this[propertyName]; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ const dateUtils = require('../services/date_utils'); | |||||||
| class Image extends Entity { | class Image extends Entity { | ||||||
|     static get tableName() { return "images"; } |     static get tableName() { return "images"; } | ||||||
|     static get primaryKeyName() { return "imageId"; } |     static get primaryKeyName() { return "imageId"; } | ||||||
|     static get syncedProperties() { return ["imageId", "format", "checksum", "name", "isDeleted", "dateModified", "dateCreated"]; } |     static get hashedProperties() { return ["imageId", "format", "checksum", "name", "isDeleted", "dateModified", "dateCreated"]; } | ||||||
|  |  | ||||||
|     beforeSaving() { |     beforeSaving() { | ||||||
|         super.beforeSaving(); |         super.beforeSaving(); | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ const sql = require('../services/sql'); | |||||||
| class Label extends Entity { | class Label extends Entity { | ||||||
|     static get tableName() { return "labels"; } |     static get tableName() { return "labels"; } | ||||||
|     static get primaryKeyName() { return "labelId"; } |     static get primaryKeyName() { return "labelId"; } | ||||||
|     static get syncedProperties() { return ["labelId", "noteId", "name", "value", "dateModified", "dateCreated"]; } |     static get hashedProperties() { return ["labelId", "noteId", "name", "value", "dateModified", "dateCreated"]; } | ||||||
|  |  | ||||||
|     async getNote() { |     async getNote() { | ||||||
|         return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]); |         return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]); | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ const dateUtils = require('../services/date_utils'); | |||||||
| class Note extends Entity { | class Note extends Entity { | ||||||
|     static get tableName() { return "notes"; } |     static get tableName() { return "notes"; } | ||||||
|     static get primaryKeyName() { return "noteId"; } |     static get primaryKeyName() { return "noteId"; } | ||||||
|     static get syncedProperties() { return ["noteId", "title", "content", "type", "dateModified", "isProtected", "isDeleted"]; } |     static get hashedProperties() { return ["noteId", "title", "content", "type", "dateModified", "isProtected", "isDeleted"]; } | ||||||
|  |  | ||||||
|     constructor(row) { |     constructor(row) { | ||||||
|         super(row); |         super(row); | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ const dateUtils = require('../services/date_utils'); | |||||||
| class NoteImage extends Entity { | class NoteImage extends Entity { | ||||||
|     static get tableName() { return "note_images"; } |     static get tableName() { return "note_images"; } | ||||||
|     static get primaryKeyName() { return "noteImageId"; } |     static get primaryKeyName() { return "noteImageId"; } | ||||||
|     static get syncedProperties() { return ["noteImageId", "noteId", "imageId", "isDeleted", "dateModified", "dateCreated"]; } |     static get hashedProperties() { return ["noteImageId", "noteId", "imageId", "isDeleted", "dateModified", "dateCreated"]; } | ||||||
|  |  | ||||||
|     async getNote() { |     async getNote() { | ||||||
|         return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]); |         return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]); | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ const repository = require('../services/repository'); | |||||||
| class NoteRevision extends Entity { | class NoteRevision extends Entity { | ||||||
|     static get tableName() { return "note_revisions"; } |     static get tableName() { return "note_revisions"; } | ||||||
|     static get primaryKeyName() { return "noteRevisionId"; } |     static get primaryKeyName() { return "noteRevisionId"; } | ||||||
|     static get syncedProperties() { return ["noteRevisionId", "noteId", "title", "content", "dateModifiedFrom", "dateModifiedTo"]; } |     static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "content", "dateModifiedFrom", "dateModifiedTo"]; } | ||||||
|  |  | ||||||
|     constructor(row) { |     constructor(row) { | ||||||
|         super(row); |         super(row); | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ const dateUtils = require('../services/date_utils'); | |||||||
| class Option extends Entity { | class Option extends Entity { | ||||||
|     static get tableName() { return "options"; } |     static get tableName() { return "options"; } | ||||||
|     static get primaryKeyName() { return "name"; } |     static get primaryKeyName() { return "name"; } | ||||||
|     static get syncedProperties() { return ["name", "value"]; } |     static get hashedProperties() { return ["name", "value"]; } | ||||||
|  |  | ||||||
|     beforeSaving() { |     beforeSaving() { | ||||||
|         super.beforeSaving(); |         super.beforeSaving(); | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ const Entity = require('./entity'); | |||||||
| class RecentNote extends Entity { | class RecentNote extends Entity { | ||||||
|     static get tableName() { return "recent_notes"; } |     static get tableName() { return "recent_notes"; } | ||||||
|     static get primaryKeyName() { return "branchId"; } |     static get primaryKeyName() { return "branchId"; } | ||||||
|     static get syncedProperties() { return ["branchId", "notePath", "dateAccessed", "isDeleted"]; } |     static get hashedProperties() { return ["branchId", "notePath", "dateAccessed", "isDeleted"]; } | ||||||
| } | } | ||||||
|  |  | ||||||
| module.exports = RecentNote; | module.exports = RecentNote; | ||||||
		Reference in New Issue
	
	Block a user