From 0786a66304176fc697d5045238f2fa9c2e3a1543 Mon Sep 17 00:00:00 2001
From: Audrey Hamelers <hamelers@ebi.ac.uk>
Date: Mon, 14 Jun 2021 14:10:58 +0100
Subject: [PATCH] Reverse schema changes
---
.../entities/annotation/data-access.js | 12 ++++++------
server/xpub-model/entities/audit/data-access.js | 8 ++++----
server/xpub-model/entities/config/data-access.js | 2 +-
server/xpub-model/entities/file/data-access.js | 12 ++++++------
.../entities/ftpAccount/data-access.js | 2 +-
.../xpub-model/entities/identity/data-access.js | 8 ++++----
.../xpub-model/entities/journal/data-access.js | 8 +++-----
.../entities/manuscript/data-access.js | 14 +++++++-------
server/xpub-model/entities/note/data-access.js | 12 ++++++------
.../entities/organization/data-access.js | 6 +++---
.../entities/privacyNotice/data-access.js | 8 ++++----
server/xpub-model/entities/review/data-access.js | 14 +++++++-------
server/xpub-model/entities/role/data-access.js | 4 ++--
server/xpub-model/entities/team/data-access.js | 16 +++++++++-------
server/xpub-model/entities/user/data-access.js | 8 ++++----
15 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/server/xpub-model/entities/annotation/data-access.js b/server/xpub-model/entities/annotation/data-access.js
index 919091e9d..88c417be0 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 58f41b6c9..daa1d1e49 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 f468285df..72d071210 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 de0b538ca..e3ba53cba 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 2fbf1b304..c5e62d262 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 04d4fb368..a9b8107d4 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 96b81efbb..342cd671c 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 343c14dec..e2717c2ec 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 77953da7b..f5d6e3bc5 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 0e6a82a36..349bf46a2 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 3dc85c1ad..61b524364 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 2fa57a532..64e2cecab 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 e76df9ace..8607eee49 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 60a05c3a6..5f3f5f946 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 0ed76cffc..239aac497 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' },
},
}
}
--
GitLab