Merge pull request #1625 from IFRCGo/develop

Ingest country plan

Author: szabozoltan69

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.465
+
+### Added
+ - Ingest country plan
+
 ## 1.1.464
 
 ### Added
@@ -2121,7 +2126,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## 0.1.20
 
-[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.464...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.465...HEAD
+[1.1.465]: https://github.com/IFRCGo/go-api/compare/1.1.464...1.1.465
 [1.1.464]: https://github.com/IFRCGo/go-api/compare/1.1.463...1.1.464
 [1.1.463]: https://github.com/IFRCGo/go-api/compare/1.1.462...1.1.463
 [1.1.462]: https://github.com/IFRCGo/go-api/compare/1.1.461...1.1.462

api/management/commands/ingest_appeals.py

@@ -87,7 +87,7 @@ def get_new_or_modified_appeals(self):
             # get latest BILATERALS
             logger.info('Querying appeals API for new appeals data (bilateral)')
             url = 'http://go-api.ifrc.org/api/appealbilaterals'
-            auth = (os.getenv('APPEALS_USER'), os.getenv('APPEALS_PASS'))
+            auth = (settings.APPEALS_USER, settings.APPEALS_PASS)
 
             adapter = HTTPAdapter(max_retries=settings.RETRY_STRATEGY)
             sess = Session()

api/models.py

@@ -1925,6 +1925,7 @@ def __str__(self):
             return '%s | %s | %s' % (self.name, self.get_status_display(), str(self.created_at)[5:16])  # omit irrelevant 0
 
     # Given a request containing new CronJob log row, validate and add the CronJob log row.
+    @staticmethod
     def sync_cron(body):
         new = []
         errors = []

api/serializers.py

@@ -399,7 +399,8 @@ class RelatedAppealSerializer(ModelSerializer):
     class Meta:
         model = Appeal
         fields = (
-            'aid', 'num_beneficiaries', 'amount_requested', 'amount_funded', 'status', 'status_display', 'start_date', 'id',
+            'aid', 'num_beneficiaries', 'amount_requested', 'code',
+            'amount_funded', 'status', 'status_display', 'start_date', 'id',
         )
 
 

api/templates/admin/app_index.html

@@ -0,0 +1,23 @@
+{% extends "admin/index.html" %}
+{% load i18n %}
+
+{% block bodyclass %}{{ block.super }} app-{{ app_label }}{% endblock %}
+
+{% if not is_popup %}
+{% block breadcrumbs %}
+<div class="breadcrumbs">
+<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
+&rsaquo;
+{% for app in app_list %}
+{{ app.name }}
+{% endfor %}
+</div>
+{% if app_list.0.app_label == 'country_plan' %}
+<div style="position: relative; top: 4rem; right: 1rem">
+    <ul class="object-tools"><li><a href="https://go-wiki.ifrc.org/en/admin_guide/country_plans" target="_blank" class="historylink">?</a></li>
+    </ul>
+</div>
+{% endif %}
+{% endblock %}
+{% endif %}
+{% block sidebar %}{% endblock %}

api/templates/admin/countryplan_change_form.html

@@ -0,0 +1,7 @@
+{% extends "admin/change_form.html" %}
+{% block object-tools-items %}
+<li>
+    <a href="https://go-wiki.ifrc.org/en/admin_guide/country_plans" target="_blank" class="historylink">?</a>
+</li>
+{{ block.super }}
+{% endblock %}

api/templates/admin/countryplan_change_list.html

@@ -0,0 +1,7 @@
+{% extends "reversion/change_list.html" %}
+{% block object-tools-items %}
+<li>
+    <a href="https://go-wiki.ifrc.org/en/admin_guide/country_plans" target="_blank" class="historylink">?</a>
+</li>
+{{ block.super }}
+{% endblock %}

country_plan/admin.py

@@ -12,13 +12,19 @@
 class DataImportAdmin(admin.ModelAdmin):
     readonly_fields = ('errors',)
 
+    change_form_template = "admin/countryplan_change_form.html"
+    change_list_template = "admin/countryplan_change_list.html"
+
 
 @admin.register(CountryPlan)
 class CountryPlanAdmin(admin.ModelAdmin):
     autocomplete_fields = ('country',)
     search_fields = ('country__name',)
     list_filter = ('is_publish',)
 
+    change_form_template = "admin/countryplan_change_form.html"
+    change_list_template = "admin/countryplan_change_list.html"
+
 
 @admin.register(StrategicPriority)
 class StrategicPriorityAdmin(admin.ModelAdmin):

country_plan/factories.py

@@ -0,0 +1,8 @@
+import factory
+
+from .models import CountryPlan
+
+
+class CountryPlanFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = CountryPlan