create data source with default group specific method

kimh · Jan 12, 2016 · eed3d50 · eed3d50
1 parent 901cf6f
commit eed3d50
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/redash/handlers/data_sources.py b/redash/handlers/data_sources.py
@@ -76,7 +76,9 @@ def post(self):
         if not validate_configuration(req['type'], req['options']):
             abort(400)
 
-        datasource = models.DataSource.create(org=self.current_org, name=req['name'], type=req['type'], options=json.dumps(req['options']))
+        datasource = models.DataSource.create_with_group(org=self.current_org,
+                                                         name=req['name'],
+                                                         type=req['type'], options=json.dumps(req['options']))
 
         return datasource.to_dict(all=True)
 

diff --git a/redash/models.py b/redash/models.py
@@ -349,9 +349,11 @@ def to_dict(self, all=False, with_permissions=False):
     def __unicode__(self):
         return self.name
 
-    def post_save(self, created):
-        if created:
-            DataSourceGroup.create(data_source=self, group=self.org.default_group)
+    @classmethod
+    def create_with_group(cls, *args, **kwargs):
+        data_source = cls.create(*args, **kwargs)
+        DataSourceGroup.create(data_source=data_source, group=data_source.org.default_group)
+        return data_source
 
     @property
     def configuration(self):

diff --git a/tests/models/test_data_sources.py b/tests/models/test_data_sources.py
@@ -4,5 +4,5 @@
 
 class TestDataSourceCreate(BaseTestCase):
     def test_adds_data_source_to_default_group(self):
-        data_source = DataSource.create(org=self.factory.org, name='test', options='{}', type='pg')
+        data_source = DataSource.create_with_group(org=self.factory.org, name='test', options='{}', type='pg')
         self.assertIn(self.factory.org.default_group.id, data_source.groups)