Changeset 508 for Dev/trunk/src/server/config/couchdb-schema.json

Timestamp:

03/12/14 02:23:11 (11 years ago)

Author:

hendrikvanantwerpen

Message:

• Server handles the new flat response format correctly.
• Client widgets and survey rendering creates a flat structure.
• Fixed logic error in checking if questions in survey are published.
• Restrict accepted properties in answers and reject empty strings as properties.

File:

• Dev/trunk/src/server/config/couchdb-schema.json (modified) (10 diffs)

Dev/trunk/src/server/config/couchdb-schema.json

@@ -2 +2 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "QED Object Schema",
-  "version": "3",
+  "version": "4",
   "type": "object",
   "oneOf": [
@@ -10 +10 @@
   "definitions": {
     "nonEmptyString": { "type": "string", "minLength": 1 },
+    "codeString": { "type": "string", "pattern": "^[A-Za-z0-9]+$" },
     "schemaInfo": {
       "type": "object",
@@ -37 +38 @@
           "_rev": { "$ref": "#/definitions/nonEmptyString" },
           "categories": { "type": "array", "items": { "$ref": "#/definitions/nonEmptyString" } },
-          "code": { "$ref": "#/definitions/nonEmptyString" },
+          "code": { "$ref": "#/definitions/codeString" },
           "content": { "type": "array", "items": { "$ref": "#/definitions/content/any" } },
           "description": { "$ref": "#/definitions/nonEmptyString" },
@@ -86 +87 @@
           "_id": { "$ref": "#/definitions/nonEmptyString" },
           "_rev": { "$ref": "#/definitions/nonEmptyString" },
-          "answers": { "type": "object" },
+          "answers": {
+              "type": "object",
+              "patternProperties": {
+                  "^[A-Za-z0-9]+$": {}
+              },
+              "additionalProperties": false
+          },
           "email": { "type": "string", "format": "email" },
           "publicationDate": { "type": "string", "format": "datetime" },
@@ -139 +146 @@
         "properties": {
           "type": { "type": "string", "pattern": "^StringInput$" },
-          "subcode": { "$ref": "#/definitions/nonEmptyString" },
+          "subcode": { "$ref": "#/definitions/codeString" },
           "text": { "$ref": "#/definitions/nonEmptyString" }
         },
@@ -150 +157 @@
           "type": { "type": "string", "pattern": "^TextInput$" },
           "maxLength": { "type": "integer" },
-          "subcode": { "$ref": "#/definitions/nonEmptyString" },
+          "subcode": { "$ref": "#/definitions/codeString" },
           "text": { "$ref": "#/definitions/nonEmptyString" }
         },
@@ -163 +170 @@
           "max": { "type": "integer" },
           "places": { "type": "integer" },
-          "subcode": { "$ref": "#/definitions/nonEmptyString" },
+          "subcode": { "$ref": "#/definitions/codeString" },
           "text": { "$ref": "#/definitions/nonEmptyString" }
         },
@@ -183 +190 @@
               "minLabel": { "$ref": "#/definitions/nonEmptyString" },
               "maxLabel": { "$ref": "#/definitions/nonEmptyString" },
-              "subcode": { "$ref": "#/definitions/nonEmptyString" },
+              "subcode": { "$ref": "#/definitions/codeString" },
               "text": { "$ref": "#/definitions/nonEmptyString" }
             },
@@ -201 +208 @@
               "type": "object",
               "properties": {
-                  "subcode": { "$ref": "#/definitions/nonEmptyString" },
+                  "subcode": { "$ref": "#/definitions/codeString" },
                   "text": { "$ref": "#/definitions/nonEmptyString" }
               },
@@ -210 +217 @@
               "type": "object",
               "properties": {
-                  "subcode": { "$ref": "#/definitions/nonEmptyString" },
+                  "subcode": { "$ref": "#/definitions/codeString" },
                   "text": { "$ref": "#/definitions/nonEmptyString" }
               },