Reverse schema changes

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: {

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' },

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',

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' },
       },
     }
   }

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' },
       },
     }
   }

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' },
       },
     }
   }

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': {

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'] },

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' },
       },
     }
   }

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' },
       },
     }

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' },
       },
     }

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' },
       },
     }
   }

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' },
       },
     }

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' },
       },
     }
   }

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' },
       },
     }
   }