Merge pull request #350 from datosgobar/342-use-datajsonar-admins

342 use datajsonar admins

series_tiempo_ar_api/apps/management/admin.py

@@ -3,7 +3,7 @@
 
 from django.contrib import admin
 from .tasks import read_datajson
-from .models import IndexingTaskCron, ReadDataJsonTask, NodeAdmins
+from .models import IndexingTaskCron, ReadDataJsonTask
 
 
 class NodeAdmin(admin.ModelAdmin):
@@ -65,6 +65,5 @@ def save_model(self, request, obj, form, change):
         read_datajson.delay(obj, force=force)  # Ejecuta indexación
 
 
-admin.site.register(NodeAdmins)
 admin.site.register(IndexingTaskCron, IndexingTaskAdmin)
 admin.site.register(ReadDataJsonTask, DataJsonAdmin)

series_tiempo_ar_api/apps/management/migrations/0005_auto_20180813_1510.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-08-13 18:10
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('management', '0004_readdatajsontask_indexing_mode'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='nodeadmins',
+            name='admins',
+        ),
+        migrations.RemoveField(
+            model_name='nodeadmins',
+            name='node',
+        ),
+        migrations.DeleteModel(
+            name='NodeAdmins',
+        ),
+    ]

series_tiempo_ar_api/apps/management/models.py

@@ -115,14 +115,3 @@ class Meta:
     value = models.FloatField(default=0)
     node = models.ForeignKey(to=djar_models.Node, on_delete=models.CASCADE)
     task = models.ForeignKey(to=ReadDataJsonTask, on_delete=models.CASCADE)
-
-
-class NodeAdmins(models.Model):
-    class Meta:
-        verbose_name_plural = 'Node admins'
-
-    node = models.OneToOneField(to=djar_models.Node)
-    admins = models.ManyToManyField(to=User)
-
-    def __str__(self):
-        return "Admins de {}".format(self.node.catalog_id)

series_tiempo_ar_api/apps/metadata/migrations/0002_auto_20180813_1510.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-08-13 18:10
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('metadata', '0001_auto_20180810_1220_squashed_0002_auto_20180810_1229'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='catalogalias',
+            options={'verbose_name_plural': 'Catalog Aliases'},
+        ),
+    ]

series_tiempo_ar_api/libs/indexing/report/report_generator.py

@@ -11,7 +11,7 @@
 
 from django_datajsonar.models import Catalog, Node
 from series_tiempo_ar_api.apps.analytics.models import Query
-from series_tiempo_ar_api.apps.management.models import Indicator, NodeAdmins
+from series_tiempo_ar_api.apps.management.models import Indicator
 from series_tiempo_ar_api.libs.indexing.report import attachments
 from series_tiempo_ar_api.libs.indexing.report.indicators_generator import IndicatorsGenerator
 
@@ -58,10 +58,7 @@ def send_email(self, context, node=None):
         if not node:
             recipients = Group.objects.get(name=settings.READ_DATAJSON_RECIPIENT_GROUP).user_set.all()
         else:
-            try:
-                recipients = NodeAdmins.objects.get(node=node).admins.all()
-            except NodeAdmins.DoesNotExist:
-                recipients = []
+            recipients = node.admins.all()
 
         emails = [user.email for user in recipients]
         if not emails:  # Nothing to do here