Deploy Recording API Updates

web/language/migrations/0095_placename_audio.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.4 on 2019-11-13 20:17
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('language', '0094_community_nation_id'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='placename',
+            name='audio',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='language.Recording'),
+        ),
+    ]

web/language/models.py

@@ -236,10 +236,15 @@ class Meta:
 
 class PlaceName(CulturalModel):
     geom = models.GeometryField(null=True, default=None)
-
+
+    # 3 deprecated. Use Recording.
     audio_file = models.FileField(null=True, blank=True)
     audio_name = models.CharField(max_length=64, null=True, blank=True)
     audio_description = models.TextField(null=True, blank=True, default="")
+    # 3 deprecated. Use Recording.    
+    audio = models.ForeignKey(
+        Recording, on_delete=models.SET_NULL, null=True, blank=True
+    )
 
     kind = models.CharField(max_length=15, default="")
 

web/language/serializers.py

@@ -56,11 +56,7 @@ class Meta:
 class RecordingSerializer(serializers.ModelSerializer):
     class Meta:
         model = Recording
-        fields = ("audio_file",
-    "speaker",
-    "recorder",
-    "created",
-    "date_recorded")
+        fields = ("id", "audio_file", "speaker", "recorder", "created", "date_recorded")
 
 class LNASerializer(serializers.ModelSerializer):
     language = serializers.SlugRelatedField(read_only=True, slug_field="name")
@@ -145,8 +141,7 @@ class LanguageDetailSerializer(serializers.ModelSerializer):
         required=False,
     )
     language_audio = RecordingSerializer(read_only=True)
-
-
+    greeting_audio = RecordingSerializer(read_only=True)
 
     def to_representation(self, value):
         rep = super().to_representation(value)
@@ -189,7 +184,15 @@ class Meta:
             "family_id",
             "champion_ids",
             "languagelink_ids",
-            "places"
+            "places",
+            "total_schools",
+            "avg_hrs_wk_languages_in_school",
+            "ece_programs",
+            "avg_hrs_wk_languages_in_ece",
+            "language_nests",
+            "avg_hrs_wk_languages_in_language_nests", 
+            "community_adult_language_classes",
+            "fv_guid",
         )
 
 
@@ -248,6 +251,10 @@ class CommunityDetailSerializer(serializers.ModelSerializer):
     languages = LanguageSerializer(read_only=True, many=True)
     places = PlaceNameLightSerializer(many=True, read_only=True)
     medias = MediaLightSerializer(many=True, read_only=True)
+    audio = serializers.PrimaryKeyRelatedField(
+        queryset=Recording.objects.all(), allow_null=True, required=False
+    )
+    audio_obj = RecordingSerializer(source="audio", read_only=True)
 
     # Atomic Writable APIs
     language_ids = serializers.PrimaryKeyRelatedField(
@@ -282,18 +289,40 @@ def to_representation(self, value):
             if lid in by_lang:
                 if lnadata.lna.year > by_lang[lid]["lna"]["year"]:
                     by_lang[lid] = LNADataSerializer(lnadata).data
+                    lna_name = by_lang[lid]["lna"]["name"]
+                    print(lna_name)
+                    by_lang[lid]['lna']['url'] = self.build_lna_external_url(lna_name)
+                    # print(by_lang[lid]['lna'])
             else:
                 by_lang[lid] = LNADataSerializer(lnadata).data
+                lna_name = by_lang[lid]["lna"]["name"]
+                print(lna_name)
+                by_lang[lid]['lna']['url'] = "denis"
+                # print(by_lang[lid]['lna'])
+
         rep["lna_by_language"] = by_lang
         return rep
 
+    def build_lna_external_url(self, lna_name):
+        permalink = "https://maps.fpcc.ca/lna/"
+        try:
+            lna_external_id = lna_name.split('-')[0].strip().replace("LNA","")
+            print(lna_external_id)
+            lna_link = permalink + lna_external_id
+            print(lna_link)
+        except:
+            lna_link = permalink
+        return lna_link
+
     class Meta:
         model = Community
         fields = (
             "id",
             "name",
             "languages",
             "regions",
+            "audio",
+            "audio_obj",
             "audio_file",
             "champion_set",
             "communitylink_set",
@@ -307,12 +336,17 @@ class Meta:
             "phone",
             "alt_phone",
             "fax",
-            "audio_file",
             "language_ids",
             "champion_ids",
             "communitylink_ids",
             "places",
             "medias",
+            "notes",
+            "nation_id",
+            "population_on_reserve",
+            "population_off_reserve",
+            "fv_guid",
+            "fv_archive_link",
         )
 
 
@@ -403,6 +437,10 @@ class PlaceNameDetailSerializer(serializers.ModelSerializer):
     )
     category_obj = PlaceNameCategorySerializer(source="category", read_only=True)
     favourites = FavouritePlaceNameSerializer(many=True, read_only=True)
+    audio = serializers.PrimaryKeyRelatedField(
+        queryset=Recording.objects.all(), allow_null=True, required=False
+    )
+    audio_obj = RecordingSerializer(source="audio", read_only=True)
 
     class Meta:
         model = PlaceName
@@ -411,6 +449,8 @@ class Meta:
             "id",
             "geom",
             "other_names",
+            "audio",
+            "audio_obj",
             "audio_file",
             "audio_name",
             "audio_description",

web/language/tests/tests_community.py

@@ -1,6 +1,7 @@
 from django.test import TestCase
 from rest_framework.test import APITestCase
 from rest_framework import status
+from django.utils import timezone
 
 from users.models import User, Administrator
 from django.contrib.gis.geos import GEOSGeometry, Point
@@ -9,6 +10,8 @@
     Language, 
     Community, 
     CommunityMember, 
+    Champion,
+    Recording,
 )
 
 
@@ -29,6 +32,8 @@ def setUp(self):
 class CommunityAPITests(BaseTestCase):
     def setUp(self):
         super().setUp()
+        self.now = timezone.now()
+
         self.community1 = Community.objects.create(name="Test Community 01")
         self.community2 = Community.objects.create(name="Test Community 02")
         self.language = Language.objects.create(name="Test Language")
@@ -41,6 +46,14 @@ def setUp(self):
                     54.74840576223716
                 ]
             }"""
+        self.point = GEOSGeometry(self.FAKE_GEOM)
+
+        self.recording = Recording.objects.create(
+            speaker = "Test recording",
+            recorder = "Test recording",
+            created = self.now,
+            date_recorded = self.now,
+        )
 
     ###### ONE TEST TESTS ONLY ONE SCENARIO ######
 
@@ -49,9 +62,9 @@ def test_community_detail(self):
 		Ensure we can retrieve a newly created community object.
 		"""
 
-        point = GEOSGeometry(self.FAKE_GEOM)
         test_community = Community(name="Test community 001")
-        test_community.point = point
+        test_community.point = self.point
+        test_community.audio = self.recording
         test_community.save()
 
         response = self.client.get(
@@ -60,6 +73,9 @@ def test_community_detail(self):
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data["id"], test_community.id)
         self.assertEqual(response.data["name"], "Test community 001")
+        self.assertEqual(response.data["audio"], self.recording.id)
+        self.assertEqual(response.data["audio_obj"]["speaker"], self.recording.speaker)
+        self.assertEqual(response.data["audio_obj"]["recorder"], self.recording.recorder)
 
     def test_community_list_route_exists(self):
         """
@@ -68,6 +84,41 @@ def test_community_list_route_exists(self):
         response = self.client.get("/api/community/", format="json")
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
+    def test_community_add_audio(self):
+        """
+		Ensure we can add a community audio to a community object.
+		"""
+        # Must be logged in
+        self.assertTrue(self.client.login(username="testuser001", password="password"))
+
+        # Check we're logged in
+        response = self.client.get("/api/user/auth/")
+        self.assertEqual(response.json()["is_authenticated"], True)
+
+        test_community = Community(name="Test community audio")
+        test_community.point = self.point
+        test_community.save()
+
+        response = self.client.patch(
+            "/api/community/{}/add_audio/".format(test_community.id), 
+            {
+                "recording_id": self.recording.id
+            },
+            format="json"
+        )
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+        response = self.client.get(
+            "/api/community/{}/".format(test_community.id), format="json"
+        )
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data["id"], test_community.id)
+        self.assertEqual(response.data["name"], "Test community audio")
+        self.assertEqual(response.data["audio_obj"]["id"], self.recording.id)
+        self.assertEqual(response.data["audio_obj"]["speaker"], self.recording.speaker)
+
     def test_create_community_member_post(self):
         """
 		Ensure we can retrieve a newly created community member object.