Fix changeset link in AOI RSS feed (OSMCha#668)

* Fix changeset link in AOI RSS feed

* Fix error in defaul OSMCHA_URL value + read POSTGRES_DATABASE

* Fix settings import

Author: willemarcel

config/settings/aws_production.py

@@ -51,11 +51,11 @@
 # }
 DATABASES = {
     'default': {
-         'ENGINE': 'django.contrib.gis.db.backends.postgis',
-         'NAME': 'osmcha',
-         'USER': env('POSTGRES_USER'),
-         'PASSWORD': env('POSTGRES_PASSWORD'),
-         'HOST': env('PGHOST', default='localhost')
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
+        'NAME': env('POSTGRES_DATABASE', default='osmcha'),
+        'USER': env('POSTGRES_USER'),
+        'PASSWORD': env('POSTGRES_PASSWORD'),
+        'HOST': env('PGHOST', default='localhost')
      }
 }
 
@@ -78,6 +78,3 @@
         },
     'ORDERING_PARAM': 'order_by',
     }
-
-# CACHALOT SETTINGS
-CACHALOT_ENABLED = False

config/settings/common.py

@@ -127,11 +127,11 @@
 # }
 DATABASES = {
     'default': {
-         'ENGINE': 'django.contrib.gis.db.backends.postgis',
-         'NAME': 'osmcha',
-         'USER': env('POSTGRES_USER'),
-         'PASSWORD': env('POSTGRES_PASSWORD'),
-         'HOST': env('PGHOST', default='localhost')
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
+        'NAME': env('POSTGRES_DATABASE', default='osmcha'),
+        'USER': env('POSTGRES_USER'),
+        'PASSWORD': env('POSTGRES_PASSWORD'),
+        'HOST': env('PGHOST', default='localhost')
      }
 }
 DATABASES['default']['ATOMIC_REQUESTS'] = True
@@ -352,10 +352,6 @@
         },
     }
 
-# CACHALOT SETTINGS
-CACHALOT_TIMEOUT = 180
-CACHALOT_ENABLED = True
-
 # OSM SERVER SETTINGS
 OSM_SERVER_URL = env('OSM_SERVER_URL', default='https://www.openstreetmap.org')
 OSM_PLANET_BASE_URL = env(
@@ -378,3 +374,5 @@
     'OAUTH_REDIRECT_URI',
     default='http://localhost:8000/oauth-landing.html'
     )
+
+OSMCHA_URL = env('OSMCHA_URL', default='https://osmcha.org')

config/settings/production.py

@@ -66,11 +66,11 @@
 # }
 DATABASES = {
     'default': {
-         'ENGINE': 'django.contrib.gis.db.backends.postgis',
-         'NAME': env('POSTGRES_DATABASE', default='osmcha'),
-         'USER': env('POSTGRES_USER'),
-         'PASSWORD': env('POSTGRES_PASSWORD'),
-         'HOST': env('PGHOST', default='localhost')
+        'ENGINE': 'django.contrib.gis.db.backends.postgis',
+        'NAME': env('POSTGRES_DATABASE', default='osmcha'),
+        'USER': env('POSTGRES_USER'),
+        'PASSWORD': env('POSTGRES_PASSWORD'),
+        'HOST': env('PGHOST', default='localhost')
      }
 }
 # CACHING

osmchadjango/supervise/tests/test_views.py

@@ -864,7 +864,7 @@ def test_aoi_changesets_feed_view(self):
         items = [i for i in rss_data if i.tag == 'item']
         link = [i for i in items[0] if i.tag == 'link'][0]
         self.assertIn(
-            "?aoi=",
+            "https://osmcha.org?aoi=",
             link.text
             )
         self.assertEqual(

osmchadjango/supervise/views.py

@@ -3,6 +3,7 @@
 from django.contrib.gis.geos import GEOSGeometry, Polygon
 from django.contrib.gis.feeds import Feed
 from django.urls import reverse
+from django.conf import settings
 
 from rest_framework.generics import (
     ListCreateAPIView, ListAPIView, RetrieveUpdateDestroyAPIView,
@@ -139,10 +140,7 @@ def item_geometry(self, item):
         return item.bbox
 
     def item_link(self, item):
-        return '{}{}'.format(reverse(
-            'frontend:changeset-detail',
-            args=[item.id]
-            ), '?aoi={}'.format(self.feed_id))
+        return "{}{}".format(settings.OSMCHA_URL, "?aoi={}".format(self.feed_id))
 
     def item_pubdate(self, item):
         return item.date