apis for locations, location areas, encounters, encounter rates, characteristics, contests, super contests

zaneadix · zaneadix · commit c1f1f9ace765 · 2015-11-05T09:55:14.000-05:00
diff --git a/config/urls.py b/config/urls.py
@@ -51,12 +51,12 @@
 router.register(r"berry", BerryResource)
 router.register(r"berry-firmness", BerryFirmnessResource)
 router.register(r"characteristic", CharacteristicResource)
+router.register(r"contest-type", ContestTypeResource)
+router.register(r"contest-effect", ContestEffectResource)
 router.register(r"egg-group", EggGroupResource)
-
-router.register(r"encounter", EncounterResource) # ?
 router.register(r"encounter-method", EncounterMethodResource) # ?
-router.register(r"encounter-slot", EncounterSlotResource) # ?
-
+router.register(r"encounter-condition", EncounterConditionResource) # ?
+router.register(r"encounter-condition-value", EncounterConditionValueResource) # ?
 router.register(r"evolution-chain", EvolutionChainResource)
 router.register(r"evolution-trigger", EvolutionTriggerResource)
 router.register(r"generation", GenerationResource)
@@ -67,10 +67,8 @@
 router.register(r"item-fling-effect", ItemFlingEffectResource)
 router.register(r"item-pocket", ItemPocketResource)
 router.register(r"language", LanguageResource)
-
 router.register(r"location", LocationResource)
 router.register(r"location-area", LocationAreaResource) # ?
-
 router.register(r"move", MoveResource)
 router.register(r"move-ailment", MoveMetaAilmentResource)
 router.register(r"move-category", MoveMetaCategoryResource)
@@ -87,6 +85,7 @@
 router.register(r"pokemon-form", PokemonFormResource)
 router.register(r"region", RegionResource)
 router.register(r"stat", StatResource)
+router.register(r"super-contest-effect", SuperContestEffectResource)
 router.register(r"type", TypeResource)
 router.register(r"version", VersionResource)
 router.register(r"version-group", VersionGroupResource)
diff --git a/data/v2/build.py b/data/v2/build.py
@@ -1626,21 +1626,6 @@ def clearTable(model):
     model.save()
 
 
-clearTable(LocationAreaEncounterRate)
-data = loadData('location_area_encounter_rates.csv')
-
-for index, info in enumerate(data):
-  if index > 0:
-
-    model = LocationAreaEncounterRate (
-        location_area = LocationArea.objects.get(pk = int(info[0])),
-        encounter_method = None,
-        version = Version.objects.get(pk = int(info[2])),
-        rate = int(info[3])
-      )
-    model.save()
-
-
     
 #############
 #  POKEMON  #
@@ -2062,6 +2047,28 @@ def clearTable(model):
     model.save()
 
 
+# LocationAreaEncounterRate/EncounterMethod associations
+"""
+I tried handling this the same way Berry/Natures are handled
+but for some odd reason it resulted in a ton of db table issues.
+It was easy enough to move LocationAreaEncounterRates below
+Encounter population and for some reason things works now.
+"""
+clearTable(LocationAreaEncounterRate)
+data = loadData('location_area_encounter_rates.csv')
+
+for index, info in enumerate(data):
+  if index > 0:
+
+    model = LocationAreaEncounterRate (
+        location_area = LocationArea.objects.get(pk = int(info[0])),
+        encounter_method = EncounterMethod.objects.get(pk=info[1]),
+        version = Version.objects.get(pk = int(info[2])),
+        rate = int(info[3])
+      )
+    model.save()
+
+
 clearTable(EncounterMethodName)
 data = loadData('encounter_method_prose.csv')
 
@@ -2179,17 +2186,6 @@ def clearTable(model):
     model.save()
 
 
-#Location/Encounter associations
-data = loadData('location_area_encounter_rates.csv')
-
-for index, info in enumerate(data):
-  if index > 0:
-
-    laer = LocationAreaEncounterRate.objects.get(pk = int(info[0]))
-    laer.encounter_method = EncounterMethod.objects.get(pk = int(info[1]))
-    laer.save()
-
-
 
 ##############
 #  PAL PARK  #
diff --git a/pokemon_v2/migrations/0002_auto_20151102_2124.py b/pokemon_v2/migrations/0002_auto_20151102_2124.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pokemon_v2', '0001_squashed_0024_auto_20151027_0023'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='encounterconditionvaluename',
+            name='encounter_condition_value',
+            field=models.ForeignKey(related_name='encounterconditionvaluename', blank=True, to='pokemon_v2.EncounterConditionValue', null=True),
+            preserve_default=True,
+        ),
+    ]
diff --git a/pokemon_v2/migrations/0003_auto_20151105_0309.py b/pokemon_v2/migrations/0003_auto_20151105_0309.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pokemon_v2', '0002_auto_20151102_2124'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='supercontesteffectflavortext',
+            name='super_contest_effect',
+            field=models.ForeignKey(related_name='supercontesteffectflavortext', blank=True, to='pokemon_v2.SuperContestEffect', null=True),
+            preserve_default=True,
+        ),
+    ]
diff --git a/pokemon_v2/models.py b/pokemon_v2/models.py
@@ -840,7 +840,7 @@ class EncounterConditionValue(HasEncounterCondition, HasName):
 
 class EncounterConditionValueName(IsName):
 
-  encounter_condition_value = models.ForeignKey(EncounterConditionValue, blank = True, null = True)
+  encounter_condition_value = models.ForeignKey(EncounterConditionValue, blank = True, null = True, related_name="%(class)s")
 
 
 class EncounterConditionValueMap(models.Model):
@@ -1116,7 +1116,7 @@ class SuperContestEffect(models.Model):
 
 class SuperContestEffectFlavorText(IsFlavorText):
 
-  super_contest_effect = models.ForeignKey(SuperContestEffect, blank = True, null = True)
+  super_contest_effect = models.ForeignKey(SuperContestEffect, blank = True, null = True, related_name="%(class)s")
 
 
 class SuperContestCombo(models.Model):
diff --git a/pokemon_v2/serializers.py b/pokemon_v2/serializers.py
diff --git a/pokemon_v2/views.py b/pokemon_v2/views.py
