Add test for dup gist child and remove trash folder exclude iinside the dup gist dirs

Author: Harshg999

desktop/core/src/desktop/api2_tests.py

@@ -705,8 +705,15 @@ def test_multiple_gist_dirs_on_gist_create(self):
 
     gist_dir1 = Directory.objects.create(name=Document2.GIST_DIR, owner=self.user, parent_directory=home_dir)
     gist_dir2 = Directory.objects.create(name=Document2.GIST_DIR, owner=self.user, parent_directory=home_dir)
+    gist_child = Document2.objects.create(
+      name='test_gist_child',
+      data=json.dumps({'statement': 'SELECT 123'}),
+      owner=self.user,
+      type='gist',
+      parent_directory=gist_dir2,
+    )
 
-    assert_equal(2, Directory.objects.filter(name=Document2.GIST_DIR, type='directory').count())
+    assert_equal(2, Directory.objects.filter(name=Document2.GIST_DIR, type='directory', owner=self.user).count())
 
     # get_gist_directory merges all duplicate gist directories into one
     response = self._create_gist(
@@ -715,11 +722,12 @@ def test_multiple_gist_dirs_on_gist_create(self):
       name='test_gist_create',
     )
     gist_uuid = json.loads(response.content)['uuid']
-    gist_parent_uuid = Document2.objects.get(uuid=gist_uuid).parent_directory.uuid
+    gist_home = Document2.objects.get(uuid=gist_uuid).parent_directory
 
-    assert_equal(1, Directory.objects.filter(name=Document2.GIST_DIR, type='directory').count())
-    assert_true(Directory.objects.filter(name=Document2.GIST_DIR, type='directory', uuid=gist_parent_uuid).exists())
-    assert_equal(gist_dir1.uuid, Directory.objects.get(name=Document2.GIST_DIR, type='directory', parent_directory=home_dir).uuid)
+    assert_equal(1, Directory.objects.filter(name=Document2.GIST_DIR, type='directory', owner=self.user).count())
+    assert_true(Directory.objects.filter(name=Document2.GIST_DIR, type='directory', uuid=gist_home.uuid).exists())
+    assert_equal(gist_dir1.uuid, gist_home.uuid)
+    assert_equal(Document2.objects.get(name='test_gist_child', type='gist', owner=self.user).parent_directory, gist_home)
 
 
   def test_get(self):

desktop/core/src/desktop/models.py

@@ -1079,9 +1079,8 @@ def get_gist_directory(self, user):
       all_gist_dirs = self.filter(owner=user, parent_directory=home_dir, name=Document2.GIST_DIR, type='directory').order_by('-last_modified')
       gist_dir = all_gist_dirs.last()
       gist_dirs_dup = all_gist_dirs.exclude(uuid=gist_dir.uuid)
-
       for dir in gist_dirs_dup:
-        dir.children.exclude(name='.Trash').update(parent_directory=gist_dir)
+        dir.children.update(parent_directory=gist_dir)
 
       gist_dirs_dup.delete()