diff --git a/server/xpub-model/entities/annotation/data-access.js b/server/xpub-model/entities/annotation/data-access.js
index 919091e9d675cd9e1cc6a8135de77abdd1b5f96a..88c417be07e524efa4445e9ee60ebbc8b957b93f 100755
--- a/server/xpub-model/entities/annotation/data-access.js
+++ b/server/xpub-model/entities/annotation/data-access.js
@@ -21,12 +21,12 @@ class Annotation extends EpmcBaseModel {
return {
properties: {
id: { type: 'uuid' },
- created: { type: 'string', format: 'date-time' },
- updated: { type: 'string', format: 'date-time' },
- deleted: { type: 'string', format: 'date-time' },
- userId: { type: 'string', format: 'uuid' },
- reviewId: { type: 'string', format: 'uuid' },
- fileId: { type: 'string', format: 'uuid' },
+ created: { type: 'timestamp' },
+ updated: { type: 'timestamp' },
+ deleted: { type: 'timestamp' },
+ userId: { type: 'uuid' },
+ reviewId: { type: 'uuid' },
+ fileId: { type: 'uuid' },
quote: { type: 'string' },
text: { type: 'string' },
ranges: {
diff --git a/server/xpub-model/entities/audit/data-access.js b/server/xpub-model/entities/audit/data-access.js
index 58f41b6c9023aeaf41ba343d405baa6575df2d97..daa1d1e49a67ccde3043e68c20ae8a58bcb69e20 100644
--- a/server/xpub-model/entities/audit/data-access.js
+++ b/server/xpub-model/entities/audit/data-access.js
@@ -13,11 +13,11 @@ class Audit extends EpmcBaseModel {
static get schema() {
return {
properties: {
- id: { type: 'string', format: 'uuid' },
- created: { type: 'string', format: 'date-time' },
- userId: { type: 'string', format: 'uuid' },
+ id: { type: 'uuid' },
+ created: { type: 'timestamp' },
+ userId: { type: 'uuid' },
action: { type: 'string' },
- objectId: { type: 'string', format: 'uuid' },
+ objectId: { type: 'uuid' },
originalData: { type: 'object' },
changes: { type: 'object' },
objectType: { type: 'string' },
diff --git a/server/xpub-model/entities/config/data-access.js b/server/xpub-model/entities/config/data-access.js
index f468285dfa511e987af35c81f4b6685697b8305b..72d0712104b937b22a60a4087cacb7359a5b41de 100644
--- a/server/xpub-model/entities/config/data-access.js
+++ b/server/xpub-model/entities/config/data-access.js
@@ -16,7 +16,7 @@ class Job extends EpmcBaseModel {
description: { type: 'string' },
running: { type: 'boolean' },
lastStatus: { type: 'string', enum: ['pass', 'fail'] },
- lastPass: { type: 'string', format: 'date-time' },
+ lastPass: { type: 'timestamp' },
frequency: {
type: 'string',
format: 'regex',
diff --git a/server/xpub-model/entities/file/data-access.js b/server/xpub-model/entities/file/data-access.js
index de0b538cacb58c36fe5b3a3a4c21df47299bfdc7..e3ba53cbab7131dd06a12edb70b69681da98f4ed 100644
--- a/server/xpub-model/entities/file/data-access.js
+++ b/server/xpub-model/entities/file/data-access.js
@@ -11,18 +11,18 @@ class File extends EpmcBaseModel {
static get schema() {
return {
properties: {
- id: { type: 'string', format: 'uuid' },
+ id: { type: 'uuid' },
manuscriptId: { type: 'string' },
- manuscriptVersion: { type: 'number' },
+ manuscriptVersion: { type: 'numeric' },
filename: { type: 'string' },
mimeType: { type: 'string' },
type: { type: 'string' },
- size: { type: 'integer' },
+ size: { type: 'int' },
url: { type: 'string' },
label: { type: ['string', 'null'] },
- deleted: { type: 'string', format: 'date-time' },
- updated: { type: 'string', format: 'date-time' },
- updatedBy: { type: 'string', format: 'uuid' },
+ deleted: { type: 'timestamp' },
+ updated: { type: 'timestamp' },
+ updatedBy: { type: 'uuid' },
},
}
}
diff --git a/server/xpub-model/entities/ftpAccount/data-access.js b/server/xpub-model/entities/ftpAccount/data-access.js
index 2fbf1b304515add6770ce4f8669f1bc77cb87894..c5e62d26234b2a3e2c1c88462bb6c1bcd9b1a763 100755
--- a/server/xpub-model/entities/ftpAccount/data-access.js
+++ b/server/xpub-model/entities/ftpAccount/data-access.js
@@ -12,7 +12,7 @@ class FtpAccount extends EpmcBaseModel {
name: { type: 'string' },
description: { type: 'string' },
username: { type: 'string' },
- password: { type: 'string' },
+ password: { type: 'text' },
},
}
}
diff --git a/server/xpub-model/entities/identity/data-access.js b/server/xpub-model/entities/identity/data-access.js
index 04d4fb36860de515287a66f85b45a27edccb3351..a9b8107d452a61eb571064987414b9d1dbdafd6b 100755
--- a/server/xpub-model/entities/identity/data-access.js
+++ b/server/xpub-model/entities/identity/data-access.js
@@ -29,12 +29,12 @@ class Identity extends EpmcBaseModel {
static get schema() {
return {
properties: {
- id: { type: 'string', format: 'uuid' },
+ id: { type: 'uuid' },
email: { type: 'string' },
passwordHash: { type: 'string' },
passwordResetToken: { type: 'string' },
name: { type: 'object' },
- userId: { type: 'string', format: 'uuid' },
+ userId: { type: 'uuid' },
identifier: { type: ['string', 'null'] },
meta: {
type: ['object', 'null'],
@@ -43,8 +43,8 @@ class Identity extends EpmcBaseModel {
publisher: { type: ['string', 'null'] },
},
},
- deleted: { type: 'string', format: 'date-time' },
- updatedBy: { type: 'string', format: 'uuid' },
+ deleted: { type: 'timestamp' },
+ updatedBy: { type: 'uuid' },
},
}
}
diff --git a/server/xpub-model/entities/journal/data-access.js b/server/xpub-model/entities/journal/data-access.js
index 96b81efbbb0cff0a4d9b46d598011908434eed27..342cd671c3741d92f264c511e3739a2f0bfb0033 100644
--- a/server/xpub-model/entities/journal/data-access.js
+++ b/server/xpub-model/entities/journal/data-access.js
@@ -17,11 +17,9 @@ class Journal extends EpmcBaseModel {
static get schema() {
return {
properties: {
- id: { type: 'string', format: 'uuid' },
- created: { type: 'string', format: 'date-time' },
- updated: {
- anyOf: [{ type: 'string', format: 'date-time' }, { type: 'null' }],
- },
+ id: { type: 'uuid' },
+ created: { type: 'timestamp' },
+ updated: { type: ['timestamp', 'null'] },
journalTitle: { type: 'string' },
'meta,publisherName': { type: ['string', 'null'] },
'meta,issn': {
diff --git a/server/xpub-model/entities/manuscript/data-access.js b/server/xpub-model/entities/manuscript/data-access.js
index 343c14decf235c7e28f40c4edc327642b091cda7..e2717c2ece6591f88e5a999286e15f6df87c16e5 100644
--- a/server/xpub-model/entities/manuscript/data-access.js
+++ b/server/xpub-model/entities/manuscript/data-access.js
@@ -17,20 +17,20 @@ class Manuscript extends EpmcBaseModel {
return {
properties: {
id: { type: 'string', format: 'regex', pattern: 'EMS\\d+' },
- organizationId: { type: 'string', format: 'uuid' },
+ organizationId: { type: 'uuid' },
journalId: { type: 'uuid' },
- created: { type: 'string', format: 'date-time' },
- updated: { type: 'string', format: 'date-time' },
- deleted: { type: 'string', format: 'date-time' },
+ created: { type: 'timestamp' },
+ updated: { type: 'timestamp' },
+ deleted: { type: 'timestamp' },
updatedBy: { type: 'uuid' },
claimedBy: { type: ['string', 'null'] },
- version: { type: 'number' },
+ version: { type: 'numeric' },
status: { type: ['string', 'null'] },
formState: { type: ['string', 'null'] },
decision: { type: ['string', 'null'] },
- pdfDepositId: { type: 'string', format: 'uuid' },
+ pdfDepositId: { type: 'uuid' },
pdfDepositState: { type: ['string', 'null'] },
- retryAttempt: { type: 'number' },
+ retryAttempt: { type: ['numeric'] },
ncbiState: { type: ['string', 'null'] },
ebiState: { type: ['string', 'null'] },
'meta,title': { type: ['string', 'null'] },
diff --git a/server/xpub-model/entities/note/data-access.js b/server/xpub-model/entities/note/data-access.js
index 77953da7bab28fc72db0a8280b9f7da36a57a352..f5d6e3bc5666dd8bee7deb926766257b5719f89a 100755
--- a/server/xpub-model/entities/note/data-access.js
+++ b/server/xpub-model/entities/note/data-access.js
@@ -12,15 +12,15 @@ class Note extends EpmcBaseModel {
static get schema() {
return {
properties: {
- id: { type: 'string', format: 'uuid' },
- created: { type: 'string', format: 'date-time' },
- updated: { type: 'string', format: 'date-time' },
- deleted: { type: 'string', format: 'date-time' },
+ id: { type: 'uuid' },
+ created: { type: 'timestamp' },
+ updated: { type: 'timestamp' },
+ deleted: { type: 'timestamp' },
manuscriptId: { type: 'string' },
- manuscriptVersion: { type: 'number' },
+ manuscriptVersion: { type: 'numeric' },
content: { type: 'string' },
notesType: { type: 'string' },
- updatedBy: { type: 'string', format: 'uuid' },
+ updatedBy: { type: 'uuid' },
},
}
}
diff --git a/server/xpub-model/entities/organization/data-access.js b/server/xpub-model/entities/organization/data-access.js
index 0e6a82a36ac216c96b1702604a33d310bd0034e5..349bf46a25bcb6aa533d9c1900374995547da425 100755
--- a/server/xpub-model/entities/organization/data-access.js
+++ b/server/xpub-model/entities/organization/data-access.js
@@ -13,9 +13,9 @@ class Organization extends EpmcBaseModel {
static get schema() {
return {
properties: {
- id: { type: 'string', format: 'uuid' },
- created: { type: 'string', format: 'date-time' },
- updated: { type: 'string', format: 'date-time' },
+ id: { type: 'uuid' },
+ created: { type: 'timestamp' },
+ updated: { type: 'timestamp' },
name: { type: 'string' },
},
}
diff --git a/server/xpub-model/entities/privacyNotice/data-access.js b/server/xpub-model/entities/privacyNotice/data-access.js
index 3dc85c1adee59b23867144e6fff156143f10ca29..61b5243640a7d3f72c1068ce5d3e92801018980a 100644
--- a/server/xpub-model/entities/privacyNotice/data-access.js
+++ b/server/xpub-model/entities/privacyNotice/data-access.js
@@ -12,10 +12,10 @@ class PrivacyNotice extends EpmcBaseModel {
static get schema() {
return {
properties: {
- id: { type: 'string', format: 'uuid' },
- created: { type: 'string', format: 'date-time' },
- updated: { type: 'string', format: 'date-time' },
- effectiveDate: { type: 'string', format: 'date-time' },
+ id: { type: 'uuid' },
+ created: { type: 'timestamp' },
+ updated: { type: 'timestamp' },
+ effectiveDate: { type: 'timestamp' },
version: { type: 'string' },
},
}
diff --git a/server/xpub-model/entities/review/data-access.js b/server/xpub-model/entities/review/data-access.js
index 2fa57a53223921e0333762282a53d271aed23509..64e2cecabe8225d93295cbdf2de6c764750df7c9 100755
--- a/server/xpub-model/entities/review/data-access.js
+++ b/server/xpub-model/entities/review/data-access.js
@@ -20,17 +20,17 @@ class Review extends EpmcBaseModel {
static get schema() {
return {
properties: {
- id: { type: 'string', format: 'uuid' },
- created: { type: 'string', format: 'date-time' },
- updated: { type: 'string', format: 'date-time' },
- deleted: { type: 'string', format: 'date-time' },
- userId: { type: 'string', format: 'uuid' },
+ id: { type: 'uuid' },
+ created: { type: 'timestamp' },
+ updated: { type: 'timestamp' },
+ deleted: { type: 'timestamp' },
+ userId: { type: 'uuid' },
manuscriptId: { type: 'string' },
- manuscriptVersion: { type: 'number' },
+ manuscriptVersion: { type: 'numeric' },
open: { type: 'boolean' },
comments: { type: 'string' },
recommendation: { type: 'string' },
- updatedBy: { type: 'string', format: 'uuid' },
+ updatedBy: { type: 'uuid' },
},
}
}
diff --git a/server/xpub-model/entities/role/data-access.js b/server/xpub-model/entities/role/data-access.js
index e76df9ace60182ec18d5bef0abe2363b93874859..8607eee49ceba0e14766121c21717ea101eaea73 100644
--- a/server/xpub-model/entities/role/data-access.js
+++ b/server/xpub-model/entities/role/data-access.js
@@ -11,8 +11,8 @@ class Role extends EpmcBaseModel {
return {
properties: {
name: { type: 'string' },
- created: { type: 'string', format: 'date-time' },
- updated: { type: 'string', format: 'date-time' },
+ created: { type: 'timestamp' },
+ updated: { type: 'timestamp' },
organization: { type: 'boolean' },
},
}
diff --git a/server/xpub-model/entities/team/data-access.js b/server/xpub-model/entities/team/data-access.js
index 60a05c3a6afdc685c37beddd3802e750c5650afa..5f3f5f9469b4b9ee3b12d0d23b09e0ec5ff5a4f5 100755
--- a/server/xpub-model/entities/team/data-access.js
+++ b/server/xpub-model/entities/team/data-access.js
@@ -27,15 +27,17 @@ class Team extends EpmcBaseModel {
static get schema() {
return {
properties: {
- id: { type: 'string', format: 'uuid' },
- created: { type: 'string', format: 'date-time' },
- updated: { type: 'string', format: 'date-time' },
- deleted: { type: 'string', format: 'date-time' },
+ id: { type: 'uuid' },
+ /*
+ created: { type: 'timestamp' },
+ updated: { type: 'timestamp' },
+*/
+ deleted: { type: 'timestamp' },
manuscriptId: { anyOf: [{ type: 'string' }, { type: 'null' }] },
- manuscriptVersion: { anyOf: [{ type: 'number' }, { type: 'null' }] },
- userId: { type: 'string', format: 'uuid' },
+ manuscriptVersion: { anyOf: [{ type: 'numeric' }, { type: 'null' }] },
+ userId: { type: 'uuid' },
roleName: { type: 'string' },
- updatedBy: { type: 'string', format: 'uuid' },
+ updatedBy: { type: 'uuid' },
},
}
}
diff --git a/server/xpub-model/entities/user/data-access.js b/server/xpub-model/entities/user/data-access.js
index 0ed76cffc6eeebe6d37408d787ecb305026de727..239aac4975f4b652a9fe423109fd27efd720605a 100755
--- a/server/xpub-model/entities/user/data-access.js
+++ b/server/xpub-model/entities/user/data-access.js
@@ -24,15 +24,15 @@ class User extends EpmcBaseModel {
static get schema() {
return {
properties: {
- id: { type: 'string', format: 'uuid' },
+ id: { type: ['uuid'] },
defaultIdentity: { type: 'string' },
title: { type: ['string', 'null'] },
givenNames: { type: 'string' },
surname: { type: 'string' },
privacyNoticeVersion: { type: 'string' },
- privacyNoticeAgreedDate: { type: 'string', format: 'date-time' },
- deleted: { type: 'string', format: 'date-time' },
- updatedBy: { type: 'string', format: 'uuid' },
+ privacyNoticeAgreedDate: { type: 'timestamp' },
+ deleted: { type: 'timestamp' },
+ updatedBy: { type: 'uuid' },
},
}
}