Merge pull request #962 from onaio/1327-check-num-of-submission-when-…

…count-0 check num of submission when count 0
onaio · Mar 21, 2017 · 97775d8 · 97775d8
2 parents c3f98ac + 1c127d7
commit 97775d8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/onadata/apps/logger/models/xform.py b/onadata/apps/logger/models/xform.py
@@ -813,15 +813,17 @@ def soft_delete(self):
         soft_deletion_time = datetime.now()
         deletion_suffix = soft_deletion_time.strftime('-deleted-at-%s')
         self.deleted_at = soft_deletion_time
-        self.id_string = self.id_string + deletion_suffix
-        self.sms_id_string = self.sms_id_string + deletion_suffix
+        self.id_string += deletion_suffix
+        self.sms_id_string += deletion_suffix
         self.save()
 
     def submission_count(self, force_update=False):
         if self.num_of_submissions == 0 or force_update:
             count = self.instances.filter(deleted_at__isnull=True).count()
-            self.num_of_submissions = count
-            self.save(update_fields=['num_of_submissions'])
+
+            if count != self.num_of_submissions:
+                self.num_of_submissions = count
+                self.save(update_fields=['num_of_submissions'])
         return self.num_of_submissions
     submission_count.short_description = ugettext_lazy("Submission Count")
 

diff --git a/onadata/libs/serializers/xform_serializer.py b/onadata/libs/serializers/xform_serializer.py
@@ -20,7 +20,8 @@
                                             XFORM_DATA_VERSIONS,
                                             XFORM_LINKED_DATAVIEWS,
                                             XFORM_METADATA_CACHE,
-                                            XFORM_PERMISSIONS_CACHE)
+                                            XFORM_PERMISSIONS_CACHE,
+                                            DATAVIEW_COUNT)
 from onadata.libs.utils.common_tags import GROUP_DELIMETER_TAG
 from onadata.libs.utils.decorators import check_obj
 from onadata.libs.utils.viewer_tools import (EnketoError, enketo_url,
@@ -168,6 +169,16 @@ def get_data_views(self, obj):
             return data_views
         return []
 
+    def get_num_of_submissions(self, obj):
+        if obj:
+            key = '{}{}'.format(DATAVIEW_COUNT, obj.pk)
+            count = cache.get(key)
+            if count:
+                return count
+            count = obj.submission_count()
+            cache.set(key, count)
+            return count
+
 
 class XFormBaseSerializer(XFormMixin, serializers.HyperlinkedModelSerializer):
     formid = serializers.ReadOnlyField(source='id')
@@ -192,7 +203,7 @@ class XFormBaseSerializer(XFormMixin, serializers.HyperlinkedModelSerializer):
     users = serializers.SerializerMethodField()
     enketo_url = serializers.SerializerMethodField()
     enketo_preview_url = serializers.SerializerMethodField()
-    num_of_submissions = serializers.ReadOnlyField()
+    num_of_submissions = serializers.SerializerMethodField()
     data_views = serializers.SerializerMethodField()
 
     class Meta:
@@ -229,7 +240,7 @@ class XFormSerializer(XFormMixin, serializers.HyperlinkedModelSerializer):
     users = serializers.SerializerMethodField()
     enketo_url = serializers.SerializerMethodField()
     enketo_preview_url = serializers.SerializerMethodField()
-    num_of_submissions = serializers.ReadOnlyField()
+    num_of_submissions = serializers.SerializerMethodField()
     form_versions = serializers.SerializerMethodField()
     data_views = serializers.SerializerMethodField()