Fix all tests, remove duplicated 'file' field for vectors

Signed-off-by: Nir Izraeli <nirizr@gmail.com>

Author: nirizr

server/collab/models.py

@@ -85,7 +85,6 @@ class Vector(models.Model):
                   (TYPE_MNEMONIC_HIST, "Mnemonic Hist")]
 
   instance = models.ForeignKey(Instance, related_name='vectors')
-  file = models.ForeignKey(File, related_name='vectors')
   file_version = models.ForeignKey(FileVersion, related_name='vectors')
   type = models.CharField(max_length=16, choices=TYPE_CHOICES)
   type_version = models.IntegerField()

server/collab/serializers.py

@@ -127,10 +127,6 @@ class Meta:
     fields = ('id', 'file', 'file_version', 'instance', 'type', 'type_version',
               'data')
 
-  def create(self, validated_data):
-    file = validated_data['file_version'].file
-    return self.Meta.model.objects.create(file=file, **validated_data)
-
 
 class MatchSerializer(serializers.ModelSerializer):
   class Meta:

server/collab/tasks.py

@@ -29,7 +29,7 @@ def match(task_id):
     task.update(status=Task.STATUS_STARTED, progress=0,
                 progress_max=len(requested_matchers), task_id=match.request.id)
 
-    source_filter = {'file_id': source_file,
+    source_filter = {'file_version__file': source_file,
                      'file_version_id': source_file_version}
     if source_start:
       source_filter['instance__offset__gte'] = source_start
@@ -39,11 +39,12 @@ def match(task_id):
 
     target_filter = {}
     if target_project:
-      target_filter = {'file__project_id': target_project}
+      target_filter = {'file_version__file__project_id': target_project}
     elif target_file:
-      target_filter = {'file_id': target_file}
+      target_filter = {'file_version__file': target_file}
     base_target_vectors = Vector.objects.filter(**target_filter)
-    base_target_vectors = base_target_vectors.exclude(file_id=source_file)
+    self_exclude = {'file_version__file': source_file}
+    base_target_vectors = base_target_vectors.exclude(**self_exclude)
 
     print("Running task {}".format(match.request.id))
     # TODO: order might be important here

tests/server/collab/test_all.py

@@ -8,11 +8,13 @@
 
 import random
 import json
+import inspect
+import datetime
 
 
 try:
   strtypes = (str, unicode)
-except:
+except NameError:
   strtypes = str
 
 
@@ -63,8 +65,7 @@ def rand_hash(n):
                                'source_file_version': 'file_versions'},
                      'instances': {'file_version': 'file_versions'},
                      'vectors': {'instance': 'instances',
-                                 'file_version': 'file_versions',
-                                 'file': 'files'}}
+                                 'file_version': 'file_versions'}}
 
 
 def resolve_reqs(model_name, user):
@@ -110,35 +111,42 @@ def setup_model(model_name, user):
 
 
 def assert_eq(a, b):
-  import inspect, datetime
   print(a, b)
   if isinstance(a, list) and isinstance(b, list):
     assert len(a) == len(b)
     for a_item, b_item in zip(a, b):
       assert_eq(a_item, b_item)
   elif isinstance(a, dict) and isinstance(b, dict):
     for k in b:
-      assert a[k] == b[k]
-  elif type(a) == type(b):
-    assert a == b
+      assert_eq(a[k], b[k])
+  elif isinstance(a, datetime.datetime):
+    assert_eq(a.replace(microsecond=0, tzinfo=None), b)
+  elif isinstance(b, datetime.datetime):
+    assert_eq(a, b.replace(microsecond=0, tzinfo=None))
   elif isinstance(b, dict) and (isinstance(a, models.Model) or
                                 inspect.isclass(a)):
     assert_eq(b, a)
   elif isinstance(a, dict) and (isinstance(b, models.Model) or
                                 inspect.isclass(b)):
     for k in a:
-      b_value = getattr(b, k)
+      # TODO: serializer-added values cannot be validated, so we'll have to
+      # ignore any attribute that does not exist in Model object
+      if not hasattr(b, k):
+        print("Ignoring missing model parameter: {} in {}".format(k, b))
+        continue
       a_value = a.__getitem__(k)
+      b_value = getattr(b, k)
       assert_eq(a_value, b_value)
-  #elif isinstance(b, datetime.datetime):
-  #  assert_eq(a, b.isoformat().replace('+00:00', 'Z'))
-  elif isinstance(b, models.Model):
+  elif isinstance(b, datetime.datetime):
+    assert_eq(a, b.isoformat())
+  elif isinstance(a, (int, long)) and isinstance(b, models.Model):
     assert_eq(a, b.id)
+  elif isinstance(a, strtypes) and isinstance(b, models.Model):
+    assert_eq(a, b.username)
+  elif b.__class__.__name__ == 'RelatedManager':
+    assert_eq(a, list(b.all()))
   else:
-    print(type(a), type(b))
     assert a == b
-    #raise Exception("Cannot assert equality between types {} and {}"
-    #                .format(type(a), type(b)))
 
 
 def assert_response(response, status, data=None):