schemas: clean Eitem and Item schemas

* (closes CERNDocumentServer#193 )
kpsherva · Jul 18, 2019 · b2112ba · b2112ba
1 parent c7852bc
commit b2112ba
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 47 deletions.
diff --git a/cds_dojson/schemas/records/books/book/eitem-v0.0.1.json b/cds_dojson/schemas/records/books/book/eitem-v0.0.1.json
@@ -8,11 +8,6 @@
       "minLength": 1,
       "type": "string"
     },
-    "internal_notes": {
-      "minLength": 1,
-      "title": "Internal Note",
-      "type": "string"
-    },
     "description": {
       "description": ":MARC: 0247__q or 8564_y",
       "minLength": 1,
@@ -27,16 +22,21 @@
       "title": "List of files",
       "type": "array"
     },
+    "internal_notes": {
+      "minLength": 1,
+      "title": "Internal Note",
+      "type": "string"
+    },
     "number_of_pages": {
       "description": ":MARC: ``300``",
       "minimum": 1,
       "title": "Number of pages of the EItem",
       "type": "integer"
     },
-    "public_note": {
-      "minLength": 1,
-      "title": "Public Note",
-      "type": "string"
+    "open_access": {
+      "description": "Define if the electronic item is publically accessible.",
+      "title": "Public access",
+      "type": "boolean"
     },
     "urls": {
       "description": ":MARC: ``8564``\nURLs to external resources related to this record.\n.. note::\n    Links to internal CDS resources are found in another element.",
@@ -46,11 +46,6 @@
       "minItems": 1,
       "type": "array",
       "uniqueItems": true
-    },
-    "open_access": {
-      "description": "Define if the electronic item is publically accessible.",
-      "title": "Public access",
-      "type": "boolean"
     }
   }
 }
diff --git a/cds_dojson/schemas/records/books/book/item-v0.0.1.json b/cds_dojson/schemas/records/books/book/item-v0.0.1.json
@@ -8,11 +8,6 @@
       "minLength": 1,
       "type": "string"
     },
-    "internal_notes": {
-      "minLength": 1,
-      "title": "Private Note",
-      "type": "string"
-    },
     "barcode": {
       "description": "BibCirculation field: barcode",
       "minLength": 1,
@@ -25,6 +20,11 @@
       "title": "Holding description",
       "type": "string"
     },
+    "internal_notes": {
+      "minLength": 1,
+      "title": "Private Note",
+      "type": "string"
+    },
     "library": {
       "description": ":BibCirculation field ``library``\n.. Note:: list should come from the list of Libraries registered in the system.",
       "items": {
@@ -55,7 +55,6 @@
       "items": {
         "enum": [
           "print",
-          "online",
           "CD-ROM"
         ],
         "minLength": 1,
@@ -77,11 +76,6 @@
       "title": "Physical description of an item",
       "type": "string"
     },
-    "public_note": {
-      "minLength": 1,
-      "title": "Public Note",
-      "type": "string"
-    },
     "urls": {
       "description": ":MARC: ``8564``\nURLs to external resources related to this record.\n.. note::\n    Links to internal CDS resources are found in another element.",
       "items": {
@@ -93,7 +87,10 @@
     }
   },
   "required": [
-    "medium"
+    "medium",
+    "barcode",
+    "library",
+    "location"
   ],
   "title": "Physical copy of a document",
   "type": "object"

diff --git a/cds_dojson/schemas/records/books/ymls/eitem-v0.0.1.yml b/cds_dojson/schemas/records/books/ymls/eitem-v0.0.1.yml
@@ -6,10 +6,6 @@ properties:
     format: uri
     minLength: 1
     type: string
-  internal_notes:
-    minLength: 1
-    title: Internal Note
-    type: string
   description:
     description: ':MARC: 0247__q or 8564_y'
     minLength: 1
@@ -21,15 +17,19 @@ properties:
     minItems: 1
     title: List of files
     type: array
+  internal_notes:
+    minLength: 1
+    title: Internal Note
+    type: string
   number_of_pages:
     description: ':MARC: ``300``'
     minimum: 1
     title: Number of pages of the EItem
     type: integer
-  public_note:
-    minLength: 1
-    title: Public Note
-    type: string
+  open_access:
+    description: Define if the electronic item is publically accessible.
+    title: Public access
+    type: boolean
   urls:
     description: |-
       :MARC: ``8564``
@@ -41,7 +41,4 @@ properties:
     minItems: 1
     type: array
     uniqueItems: true
-  open_access:
-    description: Define if the electronic item is publically accessible.
-    title: Public access
-    type: boolean
+
diff --git a/cds_dojson/schemas/records/books/ymls/item-v0.0.1.yml b/cds_dojson/schemas/records/books/ymls/item-v0.0.1.yml
@@ -6,10 +6,6 @@ properties:
     format: uri
     minLength: 1
     type: string
-  internal_notes:
-    minLength: 1
-    title: Private Note
-    type: string
   barcode:
     description: 'BibCirculation field: barcode'
     minLength: 1
@@ -20,6 +16,10 @@ properties:
     minLength: 1
     title: Holding description
     type: string
+  internal_notes:
+    minLength: 1
+    title: Private Note
+    type: string
   library:
     description: |-
       :BibCirculation field ``library``
@@ -48,7 +48,6 @@ properties:
     items:
       enum:
         - print
-        - online
         - CD-ROM
       minLength: 1
       type: string
@@ -65,10 +64,6 @@ properties:
     description: ':MARC: ``300`` when no pagination'
     title: Physical description of an item
     type: string
-  public_note:
-    minLength: 1
-    title: Public Note
-    type: string
   urls:
     description: |-
       :MARC: ``8564``
@@ -82,5 +77,8 @@ properties:
     uniqueItems: true
 required:
   - medium
+  - barcode
+  - library
+  - location
 title: Physical copy of a document
 type: object