Add rule upgrade

Author: nagem

bin/database.py

@@ -1301,7 +1301,7 @@ def upgrade_to_40():
     cursor = config.db.acquisitions.find({'timestamp':{'$type':'string'}})
     process_cursor(cursor, upgrade_to_40_closure)
 
-def upgrade_to_40_closure(cont, cont_name):
+def upgrade_files_to_40(cont, cont_name):
     """
     if the file has a modality, we try to find a matching classification
     key and value for each measurement in the modality's classification map
@@ -1350,6 +1350,21 @@ def upgrade_to_40_closure(cont, cont_name):
 
     return True
 
+def upgrade_rules_to_40(rule):
+
+    def adjust_type(r):
+        if r['type'] == 'file.measurement':
+            r['type'] = 'file.classification'
+        elif r['type'] == 'container.has-measurement':
+            r['type'] = 'container.has-classification'
+
+    for r in rule.get('any', []):
+        adjust_type(r)
+
+    for r in rule.get('all', []):
+        adjust_type(r)
+
+    config.db.project_rules.replace_one({'_id': rule['_id']}, rule)
 
 def upgrade_to_40():
     """
@@ -1360,7 +1375,17 @@ def upgrade_to_40():
     for cont_name in ['groups', 'projects', 'collections', 'sessions', 'acquisitions', 'analyses']:
 
         cursor = config.db[cont_name].find({'files.measurements': {'$exists': True }})
-        process_cursor(cursor, upgrade_to_40_closure, context=cont_name)
+        process_cursor(cursor, upgrade_files_to_40, context=cont_name)
+
+
+    cursor = config.db.project_rules.find({'$or': [
+        {'all.type': {'$in': ['file.measurement', 'container.has-measurement']}},
+        {'any.type': {'$in': ['file.measurement', 'container.has-measurement']}}
+    ]})
+    process_cursor(cursor, upgrade_rules_to_40)
+
+
+
 
 
 

raml/schemas/input/enginemetadata.json

@@ -40,8 +40,6 @@
                 "public":       {"type": ["boolean", "null"]},
                 "label":        {"type": ["string", "null"]},
                 "info":         {"type": ["object", "null"]},
-                "metadata":     {"type": ["object", "null"]},
-                "measurement":  {"type": ["string", "null"]},
                 "instrument":   {"type": ["string", "null"]},
                 "uid":          {"type": ["string", "null"]},
                 "timestamp":    {"type": ["string", "null"], "format": "date-time"},