subscription: update patrons jsonschema

* Corrects patron JSON schema according to guidelines. Co-Authored-by: Renaud Michotte <renaud.michotte@gmail.com>
rero · Apr 24, 2020 · a04c3ea · a04c3ea
1 parent 4392d18
commit a04c3ea
Show file tree

Hide file tree

Showing 10 changed files with 1,360 additions and 1,354 deletions.
diff --git a/rero_ils/modules/patrons/api.py b/rero_ils/modules/patrons/api.py
@@ -340,12 +340,6 @@ def organisation_pid(self):
             return patron_type.organisation_pid
         return None
 
-
-class PatronsIndexer(IlsRecordsIndexer):
-    """Holdings indexing class."""
-
-    record_cls = Patron
-
     @property
     def has_valid_subscription(self):
         """Check if the patron has a valid subscription at current time.
@@ -419,3 +413,9 @@ def get_pending_subscriptions(self):
             if transaction.status == 'open':
                 pending_subs.append(sub)
         return pending_subs
+
+
+class PatronsIndexer(IlsRecordsIndexer):
+    """Holdings indexing class."""
+
+    record_cls = Patron
diff --git a/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json b/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json
@@ -277,7 +277,7 @@
       }
     },
     "subscriptions": {
-      "title": "Patron subscriptions",
+      "title": "Subscriptions",
       "type": "array",
       "minItems": 1,
       "items": {
@@ -292,21 +292,20 @@
         "properties": {
           "start_date": {
             "title": "Subscription start date",
-            "description": "The subscription start date (date included)",
+            "description": "The subscription start date (selected date included).",
             "type": "string",
             "format": "date",
             "pattern": "\\d{4}-((0[1-9])|(1[0-2]))-(((0[1-9])|[1-2][0-9])|(3[0-1]))$"
           },
           "end_date": {
             "title": "Subscription end date",
-            "description": "The subscription end date (date excluded)",
+            "description": "The subscription end date (selected date excluded).",
             "type": "string",
             "format": "date",
             "pattern": "\\d{4}-((0[1-9])|(1[0-2]))-(((0[1-9])|[1-2][0-9])|(3[0-1]))$"
           },
           "patron_type": {
-            "title": "Patron Type",
-            "description": "Patron type linked to this subscription",
+            "title": "Patron type",
             "type": "object",
             "required": [
               "$ref"
@@ -321,7 +320,6 @@
           },
           "patron_transaction": {
             "title": "Patron transaction",
-            "description": "Patron transaction linked to this subscription",
             "type": "object",
             "required": [
               "$ref"