City-of-Helsinki#41 Add ontologyword_reference to ServiceTreeNode

services/management/commands/services_import_v4.py

@@ -541,8 +541,7 @@ def import_units(self):
     def import_services(self):
         ontologytrees = self.pk_get('ontologytree')
         ontologywords = self.pk_get('ontologyword')
-        #print('top lever ' + str(len(tree)))
-        #print(str(tree[0]))
+
         nodesyncher = ModelSyncher(ServiceTreeNode.objects.all(), lambda obj: obj.id)
         servicesyncher = ModelSyncher(ServiceType.objects.all(), lambda obj: obj.id)
 
@@ -562,6 +561,9 @@ def handle_servicenode(d):
             if obj.parent != parent:
                 obj.parent = parent
                 obj._changed = True
+            if obj.ontologyword_reference != d.get('ontologyword_reference', None):
+                obj.ontologyword_reference = d.get('ontologyword_reference')
+                obj._changed = True
 
             self._sync_searchwords(obj, d)
 
@@ -591,6 +593,7 @@ def handle_servicetype(d):
                 obj.last_modified_time = datetime.now(UTC_TIMEZONE)
                 obj.save()
                 self.services_changed = True
+            servicesyncher.mark(obj)
 
             return obj
 

services/migrations/0016_servicetreenode_ontologyword_reference.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('services', '0015_auto_20170324_1427'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='servicetreenode',
+            name='ontologyword_reference',
+            field=models.TextField(null=True),
+        ),
+    ]

services/models_v2.py

@@ -32,6 +32,8 @@ class ServiceTreeNode(MPTTModel):
     unit_count = models.PositiveIntegerField(null=True)
     keywords = models.ManyToManyField(Keyword)
 
+    ontologyword_reference = models.TextField(null=True)
+
     last_modified_time = models.DateTimeField(db_index=True, help_text='Time of last modification')
 
     objects = ServiceManager()