Skip to content

Commit

Permalink
Merge pull request #51 from hackoregon/add_211_stuff
Browse files Browse the repository at this point in the history
Add 211 stuff
  • Loading branch information
Zak-Kent committed Apr 18, 2017
2 parents f08a466 + 521415e commit 4eec92c
Show file tree
Hide file tree
Showing 9 changed files with 217 additions and 230 deletions.
72 changes: 72 additions & 0 deletions homelessAPI/homelessApp/migrations/0009_auto_20170418_1749.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-04-18 17:49
from __future__ import unicode_literals

import django.contrib.postgres.fields.ranges
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('homelessApp', '0008_auto_20170324_0258'),
]

operations = [
migrations.CreateModel(
name='BinnedAge211',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('age_range', django.contrib.postgres.fields.ranges.IntegerRangeField()),
('freq', models.IntegerField(blank=True, null=True)),
],
options={
'db_table': 'binned_age_211',
},
),
migrations.CreateModel(
name='Gender211',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('gender', models.CharField(blank=True, max_length=255, null=True)),
('freq', models.IntegerField(blank=True, null=True)),
],
options={
'db_table': 'gender_211',
},
),
migrations.CreateModel(
name='Military211',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('status', models.CharField(blank=True, max_length=255, null=True)),
('freq', models.IntegerField(blank=True, null=True)),
],
options={
'db_table': 'military_211',
},
),
migrations.CreateModel(
name='MonthDemand211',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('month', models.IntegerField(blank=True, null=True)),
('year', models.IntegerField(blank=True, null=True)),
('freq', models.IntegerField(blank=True, null=True)),
],
options={
'db_table': 'month_demand_211',
},
),
migrations.CreateModel(
name='Service211',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('service_name', models.CharField(blank=True, max_length=255, null=True)),
('freq', models.IntegerField(blank=True, null=True)),
],
options={
'db_table': 'service_211',
},
),
]
43 changes: 43 additions & 0 deletions homelessAPI/homelessApp/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,46 @@ class Acsveteran(models.Model):

class Meta:
db_table = 'acsveteran'

# ------------------------------------------------------------------------
# 211 data

class BinnedAge211(models.Model):
age_range = IntegerRangeField()
freq = models.IntegerField(blank=True, null=True)

class Meta:
db_table = 'binned_age_211'


class Gender211(models.Model):
gender = models.CharField(max_length=255, blank=True, null=True)
freq = models.IntegerField(blank=True, null=True)

class Meta:
db_table = 'gender_211'


class Military211(models.Model):
status = models.CharField(max_length=255, blank=True, null=True)
freq = models.IntegerField(blank=True, null=True)

class Meta:
db_table = 'military_211'


class MonthDemand211(models.Model):
month = models.IntegerField(blank=True, null=True)
year = models.IntegerField(blank=True, null=True)
freq = models.IntegerField(blank=True, null=True)

class Meta:
db_table = 'month_demand_211'


class Service211(models.Model):
service_name = models.CharField(max_length=255, blank=True, null=True)
freq = models.IntegerField(blank=True, null=True)

class Meta:
db_table = 'service_211'
30 changes: 30 additions & 0 deletions homelessAPI/homelessApp/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,33 @@ class PitacsethcompSerializer(serializers.ModelSerializer):
class Meta:
model = models.Pitacsethcomp
fields = '__all__'


class BinnedAge211Serializer(serializers.ModelSerializer):
class Meta:
model = models.BinnedAge211
fields = '__all__'


class Gender211Serializer(serializers.ModelSerializer):
class Meta:
model = models.Gender211
fields = '__all__'


class Military211Serializer(serializers.ModelSerializer):
class Meta:
model = models.Military211
fields = '__all__'


class MonthDemand211Serializer(serializers.ModelSerializer):
class Meta:
model = models.MonthDemand211
fields = '__all__'


class Service211Serializer(serializers.ModelSerializer):
class Meta:
model = models.Service211
fields = '__all__'
23 changes: 23 additions & 0 deletions homelessAPI/homelessApp/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,3 +220,26 @@ def test_pitacs_get_request_sends_200(self):
def test_pitacseth_get_request_sends_200(self):
response = self.c.get("/homeless/pitacseth/")
self.assertEqual(response.status_code, 200)

# -----------------------------------------------------------------
# 211 simple tests

def test_age_211_get_request_sends_200(self):
response = self.c.get("/homeless/age211/")
self.assertEqual(response.status_code, 200)

def test_gender_211_get_request_sends_200(self):
response = self.c.get("/homeless/gender211/")
self.assertEqual(response.status_code, 200)

def test_military_211_get_request_sends_200(self):
response = self.c.get("/homeless/military211/")
self.assertEqual(response.status_code, 200)

def test_month_211_get_request_sends_200(self):
response = self.c.get("/homeless/month211/")
self.assertEqual(response.status_code, 200)

def test_service_211_get_request_sends_200(self):
response = self.c.get("/homeless/service211/")
self.assertEqual(response.status_code, 200)
5 changes: 5 additions & 0 deletions homelessAPI/homelessApp/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,9 @@
url(r'^acsveteran/$', views.ListAgeHouseComp.as_view()),
url(r'^pitacs/$', views.ListPitacscomp.as_view()),
url(r'^pitacseth/$', views.ListPitacsethcomp.as_view()),
url(r'^age211/$', views.ListBinnedAge211.as_view()),
url(r'^gender211/$', views.ListGender211.as_view()),
url(r'^military211/$', views.ListMilitary211.as_view()),
url(r'^month211/$', views.ListMonthDemand211.as_view()),
url(r'^service211/$', views.ListService211.as_view()),
]
44 changes: 44 additions & 0 deletions homelessAPI/homelessApp/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ class ListSleepingLocation(BaseListView):
queryset = models.SleepingLocation.objects.all()
serializer_class = serializers.SleepingLocationSerializer

# -------------------------------------------------------------------
# acs views

class ListPitacscomp(generics.ListAPIView):
"""
Expand Down Expand Up @@ -189,3 +191,45 @@ class ListAcsrace(generics.ListAPIView):
class ListAcsveteran(generics.ListAPIView):
queryset = models.Acsveteran.objects.all()
serializer_class = serializers.AcsveteranSerializer

# -------------------------------------------------------------------
# 211 views

class ListBinnedAge211(generics.ListAPIView):
"""
Returns 211 data with the age breakdown of people using the service
"""
queryset = models.BinnedAge211.objects.all()
serializer_class = serializers.BinnedAge211Serializer


class ListGender211(generics.ListAPIView):
"""
Returns 211 data with the gender breakdown of people using the service
"""
queryset = models.Gender211.objects.all()
serializer_class = serializers.Gender211Serializer


class ListMilitary211(generics.ListAPIView):
"""
Returns 211 data with the military status of those using the service
"""
queryset = models.Military211.objects.all()
serializer_class = serializers.Military211Serializer


class ListMonthDemand211(generics.ListAPIView):
"""
Returns the counts of how many times 211 was used by month
"""
queryset = models.MonthDemand211.objects.all()
serializer_class = serializers.MonthDemand211Serializer


class ListService211(generics.ListAPIView):
"""
Returns information about the types of services 211 provided
"""
queryset = models.Service211.objects.all()
serializer_class = serializers.Service211Serializer
37 changes: 0 additions & 37 deletions utility/load_csvs/README.md

This file was deleted.

22 changes: 0 additions & 22 deletions utility/load_csvs/column_defs.py

This file was deleted.

Loading

0 comments on commit 4eec92c

Please sign in to comment.