diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..ccca24a --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +.git +*.pyc \ No newline at end of file diff --git a/.gitignore b/.gitignore index 740bb18..b3f6532 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ - +*.pyc .vagrant - +*.log \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5457092 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM alpine:3.6 + +RUN apk add --update py3-pip python3 postgresql postgresql-dev zlib-dev libjpeg-turbo-dev gcc python3-dev musl-dev make \ + && pip3 install --upgrade pip +RUN if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/python3 /usr/bin/python; fi + +WORKDIR /srv/python-code-test +ADD requirements.in /srv/python-code-test/ +RUN pip3 install -r requirements.in \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..308ed93 --- /dev/null +++ b/README.md @@ -0,0 +1,47 @@ +# Starship Listing API + +This API allows for the creation of starship sale listings. The root of the API is at `/api/` - if you request this path it will return the available endpoints. You can also explore the API using a web browser. + +# Endpoints + +## Starships + +The starship endpoint `/api/starships/` lists the available ship types and their IDs. You will need the ID of the relevant ship type when creating a listing. + +## Listings + +The listings API allows for the creation and retrieval of sale listings. To create a listing, make a POST to `/api/listings/` with the fields `name`, `price` and `ship_type`. `ship_type` should be the ID of an existing starship. + +Listings can be retrieved by a GET request to `/api/listings/`. You can use query parameters to order and filter the returned list. You can filter by `starship_class` and `active` status. + +e.g. to filter by `starship_class`: + +``` +/api/listings/?starship_class=cruiser +``` + +You can also order by `price` or `last_listed` using the `ordering` parameter. + +e.g. to order by `price`: + +``` +/api/listings/?ordering=price +``` + +### Activating and deactivating listings + +You can activate and deactivate a listing by POSTing to the relevant action endpoints. + +e.g. to deactivate listing with ID 1, POST to: + +``` +/api/listings/1/deactivate/ +``` + +and to reactivate: + +``` +/api/listings/1/activate/ +``` + +The `last_listed` timestamp is updated when a listing is reactivated. It is recommended that when retrieving listings for display, you should filter them with `active=true`. diff --git a/Vagrantfile b/Vagrantfile index 9f95721..6fab5ed 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,25 +5,14 @@ VAGRANTFILE_API_VERSION = "2" Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box = "ubuntu/trusty64" - - # local box - config.vm.define :local, primary: true do |local| - local.vm.box_url = "https://vagrantcloud.com/ubuntu/trusty64" - local.vm.hostname = "local" + config.vm.box = "ubuntu/xenial64" # Django runserver networking - local.vm.network "forwarded_port", guest: 8888, host: 8888 - local.vm.network "forwarded_port", guest: 80, host: 8989 - local.vm.network "forwarded_port", guest: 4000, host: 4000 + config.vm.network "forwarded_port", guest: 8008, host: 8008 - local.vm.provision "shell", - path:"./scripts/server-setup.sh", args: ["dev", "vagrant"] + config.vm.provision "shell", path:"./scripts/setup-server.sh" - # VirtualBox Provider config - local.vm.provider "virtualbox" do |vb| - vb.customize ["modifyvm", :id, "--memory", "512"] + config.vm.provider :virtualbox do |vb, override| + vb.memory = 512 end - end - end diff --git a/config/dev.sh b/config/dev.sh deleted file mode 100644 index 1e55fbc..0000000 --- a/config/dev.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# Dev environment-specific settings - -DB_NAME="lecodetest" -DB_USER="devuser" -DB_PASS="devpass" diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..0513217 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,18 @@ +version: "3" +services: + code-test: + build: + context: . + command: "scripts/runserver" + volumes: + - .:/srv/python-code-test + ports: + - "8008:8008" + links: + - postgresql + postgresql: + image: postgres:9.6 + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: postgres diff --git a/fabfile.py b/fabfile.py deleted file mode 100644 index 756846c..0000000 --- a/fabfile.py +++ /dev/null @@ -1,23 +0,0 @@ -from fabric.api import local - - -def run_manage(command): - local('/home/vagrant/.virtualenvs/le-code-test/bin/python /vagrant/testsite/manage.py %s' % command) - - -def web(): - run_manage('runserver 0.0.0.0:8888') - -def migrate(): - run_manage('migrate') - -def make_migrations(): - run_manage('makemigrations') - -def load_sample_data(): - run_manage('flush') - run_manage('loaddata auth_data') - run_manage('loaddata sample_data') - -def requirements(): - local('/home/vagrant/.virtualenvs/le-code-test/bin/pip install -r requirements.txt ') \ No newline at end of file diff --git a/manage.py b/manage.py new file mode 100755 index 0000000..b99c032 --- /dev/null +++ b/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testsite.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) diff --git a/manapy b/manapy new file mode 100755 index 0000000..b667b52 --- /dev/null +++ b/manapy @@ -0,0 +1,3 @@ +#!/bin/bash + +docker-compose run --rm code-test ./manage.py $* diff --git a/requirements.in b/requirements.in new file mode 100644 index 0000000..7c3599d --- /dev/null +++ b/requirements.in @@ -0,0 +1,7 @@ +django>=1.11,<2.0 +Pillow>=3.4.1,<3.5 +psycopg2>=2.6.2,<2.7 +djangorestframework>=3.9.4,<3.10 +requests>=2.21.0,<2.22 +responses>=0.10.6,<0.11 +django-filter>=2.1.0,<2.2 diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 88e7096..0000000 --- a/requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -Django==1.7.2 -ecdsa==0.11 -Fabric==1.10.1 -paramiko==1.15.2 -Pillow==2.7.0 -psycopg2==2.5.4 -pycrypto==2.6.1 diff --git a/scripts/runserver b/scripts/runserver new file mode 100755 index 0000000..cb5f69b --- /dev/null +++ b/scripts/runserver @@ -0,0 +1,11 @@ +#!/bin/sh + +until PGPASSWORD=postgres psql --host postgresql --username postgres -c '\l' > /dev/null; do + echo "Postgres is unavailable - sleeping" + sleep 1 +done + +export PYTHONUNBUFFERED=0 +./manage.py migrate +./manage.py load_starships --replace +./manage.py runserver 0.0.0.0:8008 diff --git a/scripts/server-setup-user.sh b/scripts/server-setup-user.sh deleted file mode 100755 index b1e5862..0000000 --- a/scripts/server-setup-user.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -# VirtualEnv and Django setup -# -# This is a distinct file as it's meant to be run as the primary user we SSH in as - -# Grab the environment var, default to 'dev' -ENV=${1-dev} -# ... and pick up related vars -source /vagrant/config/$ENV.sh - -# Grab the user var, default to 'vagrant' -USER=${2-vagrant} - -echo -e "\033[0;34m > Running main-user setup script, with the following parameters:\033[0m" -echo -e "\033[0;34m > Environment: $ENV\033[0m" -echo -e "\033[0;34m > Main User: $USER\033[0m" - -# Set up virtualenv directory for the user if required -if [ ! -d /home/$USER/.virtualenvs ]; then - echo -e "\033[0;31m > Creating .virtualenvs folder" - mkdir /home/$USER/.virtualenvs -fi - -# write all the profile stuff for the user if required -grep -q WORKON /home/$USER/.bashrc -if [ $? -ne 0 ]; then - echo -e "\033[0;31m > Updating profile file\033[0m" - echo "export WORKON_HOME=~/.virtualenvs" >> /home/$USER/.bashrc - echo "source /usr/local/bin/virtualenvwrapper.sh" >> /home/$USER/.bashrc - echo "export PIP_VIRTUALENV_BASE=~/.virtualenvs" >> /home/$USER/.bashrc - echo "workon le-code-test" >> /home/$USER/.bashrc - echo "cd /vagrant/" >> /home/$USER/.bashrc -fi - -echo -e "\033[0;34m > Setting up virtualenv\033[0m" -export WORKON_HOME=/home/$USER/.virtualenvs -source /usr/local/bin/virtualenvwrapper.sh -export PIP_VIRTUALENV_BASE=/home/$USER/.virtualenvs -mkvirtualenv le-code-test -workon le-code-test diff --git a/scripts/server-setup.sh b/scripts/server-setup.sh deleted file mode 100755 index 64bb430..0000000 --- a/scripts/server-setup.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# Server Setup -# -# Script to install all the requirements for the server-side part of the Infinity Health project - -# Note that we may want to tighten it up a little for production - e.g. better DB user privs. - -# Grab the environment var, default to 'dev' -ENV=${1-dev} -# ... and pick up related vars -source /vagrant/config/$ENV.sh - -# Grab the user var, default to 'vagrant' -USER=${2-vagrant} - -echo -e "\033[0;34m > Provisioning Vagrant server, with the following parameters:\033[0m" -echo -e "\033[0;34m > Environment: $ENV\033[0m" -echo -e "\033[0;34m > Main User: $USER\033[0m" - -# Housekeeping -apt-get update -apt-get install -y git vim - -# Python environment and tools -apt-get install -y python-setuptools python2.7 build-essential python-dev libncurses5-dev fabric -easy_install pip -pip install virtualenv virtualenvwrapper - -# Postgres DB setup -apt-get install -y postgresql-9.3 postgresql-client-9.3 postgresql-server-dev-9.3 -echo -e "\033[0;34m > Setting up DB. If it already exists this will generate warnings, but no harm will be done.\033[0m" -sudo -u postgres psql -c "CREATE DATABASE $DB_NAME ENCODING='UTF8' TEMPLATE=template0;" -sudo -u postgres psql -c "CREATE USER $DB_USER WITH PASSWORD '$DB_PASS';" -sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE $DB_NAME TO $DB_USER;" -if [ $ENV == 'dev' -o $ENV == 'test' ] - then - sudo -u postgres psql -c "ALTER USER $DB_USER CREATEDB;" -fi - -echo -e "\033[0;34m > Installing all the image support libs for pillow.\033[0m" -sudo apt-get install -y libjpeg62-dev zlib1g-dev libfreetype6-dev liblcms1-dev - -# do the rest as the user we'll be logging in as through SSH -chmod +x /vagrant/scripts/server-setup-user.sh -sudo -u $USER /vagrant/scripts/server-setup-user.sh $ENV $USER - -# install requirements -echo -e "\033[0;34m > Installing the pip requirements.\033[0m" -sudo -H -u vagrant /home/vagrant/.virtualenvs/le-code-test/bin/pip install -r /vagrant/requirements.txt diff --git a/scripts/setup-server-user.sh b/scripts/setup-server-user.sh new file mode 100755 index 0000000..3215a14 --- /dev/null +++ b/scripts/setup-server-user.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# VirtualEnv and Django setup + +USER=ubuntu + +# Set up virtualenv directory for the user if required +if [ ! -d /home/$USER/.virtualenvs ]; then + mkdir /home/$USER/.virtualenvs +fi + +# write all the profile stuff for the user if required +grep -q virtualenvs /home/$USER/.bashrc +if [ $? -ne 0 ]; then + echo -e "\033[0;31m > Updating profile file\033[0m" + echo "source ~/.virtualenvs/code-test/bin/activate" >> /home/$USER/.bashrc + echo "cd /vagrant/" >> /home/$USER/.bashrc +fi + +echo -e "\033[0;34m > Setting up virtualenv\033[0m" +export WORKON_HOME=/home/$USER/.virtualenvs +export PIP_VIRTUALENV_BASE=/home/$USER/.virtualenvs +python3 -m venv $PIP_VIRTUALENV_BASE/code-test +source $PIP_VIRTUALENV_BASE/code-test/bin/activate + +# install requirements +echo -e "\033[0;34m > Installing the pip requirements.\033[0m" +$PIP_VIRTUALENV_BASE/code-test/bin/pip install -U pip +$PIP_VIRTUALENV_BASE/code-test/bin/pip install wheel==0.29.0 +$PIP_VIRTUALENV_BASE/code-test/bin/pip install -r /vagrant/requirements.in + +# setup db state +cd /vagrant +./manage.py migrate diff --git a/scripts/setup-server.sh b/scripts/setup-server.sh new file mode 100755 index 0000000..c9cbdc9 --- /dev/null +++ b/scripts/setup-server.sh @@ -0,0 +1,15 @@ +#!/bin/bash +USER=ubuntu + +apt-get update +apt-get install -y git vim build-essential python3.5-dev python3-venv \ + libncurses5-dev fabric postgresql-9.5 postgresql-server-dev-9.5 \ + libjpeg62-dev zlib1g-dev libfreetype6-dev + +sudo -u postgres psql -c "CREATE DATABASE postgres ENCODING='UTF8' TEMPLATE=template0;" +sudo -u postgres psql -c "CREATE USER ubuntu;" +sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE postgres TO ubuntu;" +sudo -u postgres psql -c "ALTER USER ubuntu CREATEDB;" + +chmod +x /vagrant/scripts/setup-server-user.sh +sudo -H -u $USER /vagrant/scripts/setup-server-user.sh diff --git a/testsite/items/__init__.py b/shiptrader/__init__.py similarity index 100% rename from testsite/items/__init__.py rename to shiptrader/__init__.py diff --git a/shiptrader/admin.py b/shiptrader/admin.py new file mode 100644 index 0000000..7447c8b --- /dev/null +++ b/shiptrader/admin.py @@ -0,0 +1,13 @@ +from django.contrib import admin + +from shiptrader.models import Starship, Listing + + +@admin.register(Starship) +class StarshipAdmin(admin.ModelAdmin): + list_display = ('starship_class', 'manufacturer') + + +@admin.register(Listing) +class ListingAdmin(admin.ModelAdmin): + list_display = ('name', 'price') diff --git a/testsite/items/migrations/__init__.py b/shiptrader/management/__init__.py similarity index 100% rename from testsite/items/migrations/__init__.py rename to shiptrader/management/__init__.py diff --git a/testsite/stream/__init__.py b/shiptrader/management/commands/__init__.py similarity index 100% rename from testsite/stream/__init__.py rename to shiptrader/management/commands/__init__.py diff --git a/shiptrader/management/commands/load_starships.py b/shiptrader/management/commands/load_starships.py new file mode 100644 index 0000000..a87140e --- /dev/null +++ b/shiptrader/management/commands/load_starships.py @@ -0,0 +1,48 @@ +from django.conf import settings +from django.core.management import BaseCommand, CommandError +import requests + +from shiptrader.models import Starship + + +class Command(BaseCommand): + help = 'Loads all starship records from swapi.co' + + def add_arguments(self, parser): + parser.add_argument('--replace', action='store_true', + help='Delete any existing records before loading') + + def handle(self, *args, **options): + if options['replace']: + Starship.objects.all().delete() + + def clean_number(value): + if value in ('unknown', 'n/a'): + return None + return value.replace(',', '') + + path = settings.STARSHIP_API_PATH + while path is not None: + response = requests.get(path) + if response.status_code != 200: + raise CommandError('{} returned a response with status {}'.format( + path, response.status_code + )) + content = response.json() + if content['count'] == 0: + raise CommandError('No starships available for import') + new_starships = [] + for starship in content['results']: + new_starships.append( + Starship( + starship_class=starship['starship_class'], + manufacturer=starship['manufacturer'], + length=clean_number(starship['length']), + hyperdrive_rating=clean_number(starship['hyperdrive_rating']), + cargo_capacity=clean_number(starship['cargo_capacity']), + crew=clean_number(starship['crew']), + passengers=clean_number(starship['passengers']), + ) + ) + Starship.objects.bulk_create(new_starships) + path = content['next'] diff --git a/shiptrader/migrations/0001_initial.py b/shiptrader/migrations/0001_initial.py new file mode 100644 index 0000000..5a3bfc5 --- /dev/null +++ b/shiptrader/migrations/0001_initial.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.9 on 2018-01-16 13:15 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Listing', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255)), + ('price', models.IntegerField()), + ], + ), + migrations.CreateModel( + name='Starship', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('starship_class', models.CharField(max_length=255)), + ('manufacturer', models.CharField(max_length=255)), + ('length', models.FloatField()), + ('hyperdrive_rating', models.FloatField()), + ('cargo_capacity', models.BigIntegerField()), + ('crew', models.IntegerField()), + ('passengers', models.IntegerField()), + ], + ), + migrations.AddField( + model_name='listing', + name='ship_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='listings', to='shiptrader.Starship'), + ), + ] diff --git a/shiptrader/migrations/0002_auto_20190515_1626.py b/shiptrader/migrations/0002_auto_20190515_1626.py new file mode 100644 index 0000000..e7c526f --- /dev/null +++ b/shiptrader/migrations/0002_auto_20190515_1626.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-05-15 16:26 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shiptrader', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='starship', + name='cargo_capacity', + field=models.BigIntegerField(blank=True, null=True), + ), + migrations.AlterField( + model_name='starship', + name='crew', + field=models.IntegerField(blank=True, null=True), + ), + migrations.AlterField( + model_name='starship', + name='hyperdrive_rating', + field=models.FloatField(blank=True, null=True), + ), + migrations.AlterField( + model_name='starship', + name='length', + field=models.FloatField(blank=True, null=True), + ), + migrations.AlterField( + model_name='starship', + name='passengers', + field=models.IntegerField(blank=True, null=True), + ), + ] diff --git a/shiptrader/migrations/0003_auto_20190515_2029.py b/shiptrader/migrations/0003_auto_20190515_2029.py new file mode 100644 index 0000000..6702cab --- /dev/null +++ b/shiptrader/migrations/0003_auto_20190515_2029.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.20 on 2019-05-15 20:29 +from __future__ import unicode_literals + +from django.db import migrations, models +from django.utils import timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('shiptrader', '0002_auto_20190515_1626'), + ] + + operations = [ + migrations.AddField( + model_name='listing', + name='active', + field=models.BooleanField(default=True), + ), + migrations.AddField( + model_name='listing', + name='last_listed', + field=models.DateTimeField(default=timezone.now), + ), + ] diff --git a/testsite/stream/migrations/__init__.py b/shiptrader/migrations/__init__.py similarity index 100% rename from testsite/stream/migrations/__init__.py rename to shiptrader/migrations/__init__.py diff --git a/shiptrader/models.py b/shiptrader/models.py new file mode 100644 index 0000000..3f81086 --- /dev/null +++ b/shiptrader/models.py @@ -0,0 +1,28 @@ +from django.db import models +from django.utils.timezone import now + + +class Starship(models.Model): + starship_class = models.CharField(max_length=255) + manufacturer = models.CharField(max_length=255) + + length = models.FloatField(blank=True, null=True) + hyperdrive_rating = models.FloatField(blank=True, null=True) + cargo_capacity = models.BigIntegerField(blank=True, null=True) + + crew = models.IntegerField(blank=True, null=True) + passengers = models.IntegerField(blank=True, null=True) + + def __str__(self): + return '{}: {}, {}'.format(self.pk, self.manufacturer, self.starship_class) + + +class Listing(models.Model): + name = models.CharField(max_length=255) + ship_type = models.ForeignKey(Starship, related_name='listings') + price = models.IntegerField() + active = models.BooleanField(default=True) + last_listed = models.DateTimeField(default=now) + + def __str__(self): + return '{}: {}, {}'.format(self.pk, self.name, self.price) diff --git a/shiptrader/serializers.py b/shiptrader/serializers.py new file mode 100644 index 0000000..5ba6d21 --- /dev/null +++ b/shiptrader/serializers.py @@ -0,0 +1,18 @@ +from rest_framework import serializers + +from shiptrader.models import Starship, Listing + + +class StarshipSerializer(serializers.ModelSerializer): + + class Meta: + model = Starship + fields = '__all__' + + +class ListingSerializer(serializers.ModelSerializer): + + class Meta: + model = Listing + fields = '__all__' + read_only_fields = ('last_listed', 'active',) diff --git a/testsite/testsite/__init__.py b/shiptrader/tests/__init__.py similarity index 100% rename from testsite/testsite/__init__.py rename to shiptrader/tests/__init__.py diff --git a/shiptrader/tests/test_commands.py b/shiptrader/tests/test_commands.py new file mode 100644 index 0000000..52042a1 --- /dev/null +++ b/shiptrader/tests/test_commands.py @@ -0,0 +1,131 @@ +from django.conf import settings +from django.core.management import call_command, CommandError +from django.test import TestCase +import responses + +from shiptrader.models import Starship + +test_data = [ + { + 'count': 2, + 'next': 'https://swapi.co/api/starships/?page=2', + 'previous': None, + 'results': [ + { + 'name': 'Executor', + 'model': 'Executor-class star dreadnought', + 'manufacturer': 'Kuat Drive Yards,Fondor Shipyards', + 'cost_in_credits': '1143350000', + 'length': '19000', + 'max_atmosphering_speed': 'n/a', + 'crew': '279144', + 'passengers': '38000', + 'cargo_capacity': '250000000', + 'consumables': '6 years', + 'hyperdrive_rating': '2.0', + 'MGLT': '40', + 'starship_class': 'Star dreadnought', + 'pilots': [], + 'films': [ + 'https://swapi.co/api/films/2/', + 'https://swapi.co/api/films/3/' + ], + 'created': '2014-12-15T12:31:42.547000Z', + 'edited': '2017-04-19T10:56:06.685592Z', + 'url': 'https://swapi.co/api/starships/15/' + }, + ] + }, + { + 'count': 2, + 'next': None, + 'previous': None, + 'results': [ + { + "name": "Sentinel-class landing craft", + "model": "Sentinel-class landing craft", + "manufacturer": "Sienar Fleet Systems,Cyngus Spaceworks", + "cost_in_credits": "240000", + "length": "38", + "max_atmosphering_speed": "1000", + "crew": "5", + "passengers": "75", + "cargo_capacity": "180000", + "consumables": "1 month", + "hyperdrive_rating": "1.0", + "MGLT": "70", + "starship_class": "landing craft", + "pilots": [], + "films": [ + "https://swapi.co/api/films/1/" + ], + "created": "2014-12-10T15:48:00.586000Z", + "edited": "2014-12-22T17:35:44.431407Z", + "url": "https://swapi.co/api/starships/5/" + }, + ] + } +] + + +class LoadStarshipsTestCase(TestCase): + + def test_starship_import(self): + with responses.RequestsMock() as rsps: + rsps.add( + rsps.GET, + settings.STARSHIP_API_PATH, + json=test_data[0], + match_querystring=True + ) + rsps.add( + rsps.GET, + settings.STARSHIP_API_PATH + '?page=2', + json=test_data[1], + match_querystring=True + ) + call_command('load_starships') + self.assertEqual(Starship.objects.count(), 2) + + def test_starship_import_unspecified_values(self): + altered_test_data = test_data.copy() + altered_test_data[0]['results'][0]['cargo_capacity'] = 'unknown' + altered_test_data[1]['results'][0]['passengers'] = 'n/a' + + with responses.RequestsMock() as rsps: + rsps.add( + rsps.GET, + settings.STARSHIP_API_PATH, + json=altered_test_data[0], + match_querystring=True + ) + rsps.add( + rsps.GET, + settings.STARSHIP_API_PATH + '?page=2', + json=altered_test_data[1], + match_querystring=True + ) + call_command('load_starships') + self.assertEqual(Starship.objects.count(), 2) + self.assertIsNone( + Starship.objects.all()[0].cargo_capacity + ) + self.assertIsNone( + Starship.objects.all()[1].passengers + ) + + def test_errors_for_empty(self): + with responses.RequestsMock() as rsps: + rsps.add( + rsps.GET, + settings.STARSHIP_API_PATH, + json={ + 'count': 0, + 'next': None, + 'previous': None, + 'results': [] + }, + match_querystring=True + ) + with self.assertRaises(CommandError): + call_command('load_starships') diff --git a/shiptrader/tests/test_views.py b/shiptrader/tests/test_views.py new file mode 100644 index 0000000..46374b2 --- /dev/null +++ b/shiptrader/tests/test_views.py @@ -0,0 +1,170 @@ +from datetime import timedelta + +from django.urls import reverse +from django.utils.timezone import now +from rest_framework import status +from rest_framework.test import APITestCase + +from shiptrader.models import Starship, Listing + + +def create_starships(): + Starship( + starship_class='cruiser', + manufacturer='SpaceX', + length=12.5, + hyperdrive_rating=1.3, + cargo_capacity=1800, + crew=3, + passengers=4, + ).save() + Starship( + starship_class='battleship', + manufacturer='BlueOrigin', + length=5.5, + hyperdrive_rating=5.0, + cargo_capacity=500, + crew=1, + passengers=2, + ).save() + + +class StarshipTestCase(APITestCase): + + def setUp(self): + create_starships() + + def test_get_starship_list(self): + response = self.client.get( + reverse('starship-list'), format='json' + ) + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data['count'], 2) + + def test_get_starship_detail(self): + pk = Starship.objects.first().id + response = self.client.get( + reverse('starship-detail', kwargs={'pk': pk}), format='json' + ) + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data['starship_class'], 'cruiser') + + +class ListingTestCase(APITestCase): + + def setUp(self): + create_starships() + self.starship_1 = Starship.objects.all()[0] + self.starship_2 = Starship.objects.all()[1] + + def test_create_listing(self): + response = self.client.post( + reverse('listing-list'), format='json', + data={'name': 'Victory', 'price': 10, 'ship_type': self.starship_1.id} + ) + self.assertEqual(response.status_code, status.HTTP_201_CREATED) + self.assertEqual(Listing.objects.all().count(), 1) + self.assertEqual(Listing.objects.first().ship_type, self.starship_1) + self.assertEqual(Listing.objects.first().active, True) + self.assertLess( + now() - Listing.objects.first().last_listed, + timedelta(seconds=1) + ) + + def test_list_listings_by_price(self): + Listing(name='Victory', price=10, ship_type=self.starship_1).save() + Listing(name='Arrow', price=50, ship_type=self.starship_2).save() + + response = self.client.get( + reverse('listing-list'), {'ordering': '-price'} + ) + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual( + response.data['results'][0]['name'], + 'Arrow' + ) + self.assertEqual( + response.data['results'][1]['name'], + 'Victory' + ) + + def test_list_listings_by_date(self): + Listing(name='Victory', price=10, ship_type=self.starship_1).save() + Listing( + name='Arrow', price=50, ship_type=self.starship_2, + last_listed=now() - timedelta(days=3) + ).save() + + response = self.client.get( + reverse('listing-list'), {'ordering': 'last_listed'}, + ) + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data['count'], 2) + self.assertEqual( + response.data['results'][0]['name'], + 'Arrow' + ) + self.assertEqual( + response.data['results'][1]['name'], + 'Victory' + ) + + def test_filter_listings_by_class(self): + Listing(name='Victory', price=10, ship_type=self.starship_1).save() + Listing(name='Arrow', price=50, ship_type=self.starship_2).save() + + response = self.client.get( + reverse('listing-list'), + {'starship_class': self.starship_1.starship_class} + ) + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data['count'], 1) + self.assertEqual( + response.data['results'][0]['name'], + 'Victory' + ) + + def test_deactivate_listing(self): + listing = Listing(name='Victory', price=10, ship_type=self.starship_1) + listing.save() + + response = self.client.post( + reverse('listing-deactivate', kwargs={'pk': listing.id}), + ) + self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) + self.assertFalse(Listing.objects.get(pk=listing.id).active) + + def test_activate_listing(self): + listing = Listing( + name='Victory', price=10, ship_type=self.starship_1, + active=False, last_listed=now() - timedelta(days=3) + ) + listing.save() + + response = self.client.post( + reverse('listing-activate', kwargs={'pk': listing.id}), + ) + self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) + self.assertTrue(Listing.objects.get(pk=listing.id).active) + self.assertLess( + now() - Listing.objects.get(pk=listing.id).last_listed, + timedelta(seconds=1) + ) + + def test_activate_active_listing_does_not_update_last_listed(self): + first_listed = now() - timedelta(days=3) + listing = Listing( + name='Victory', price=10, ship_type=self.starship_1, + last_listed=first_listed + ) + listing.save() + + response = self.client.post( + reverse('listing-activate', kwargs={'pk': listing.id}), + ) + self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) + self.assertTrue(Listing.objects.get(pk=listing.id).active) + self.assertEqual( + Listing.objects.get(pk=listing.id).last_listed, + first_listed + ) diff --git a/shiptrader/urls.py b/shiptrader/urls.py new file mode 100644 index 0000000..232e2cd --- /dev/null +++ b/shiptrader/urls.py @@ -0,0 +1,13 @@ +from django.conf.urls import url, include + +from rest_framework import routers + +from . import views + +router = routers.DefaultRouter() +router.register(r'starships', views.StarshipView) +router.register(r'listings', views.ListingView) + +urlpatterns = [ + url(r'^', include(router.urls)), +] diff --git a/shiptrader/views.py b/shiptrader/views.py new file mode 100644 index 0000000..044ebe5 --- /dev/null +++ b/shiptrader/views.py @@ -0,0 +1,74 @@ +import django_filters +from django_filters.rest_framework import DjangoFilterBackend +from django.utils.timezone import now +from rest_framework import mixins, viewsets, decorators, status +from rest_framework.filters import OrderingFilter +from rest_framework.response import Response + +from shiptrader.serializers import StarshipSerializer, ListingSerializer +from shiptrader.models import Starship, Listing + + +class StarshipView( + mixins.RetrieveModelMixin, mixins.ListModelMixin, viewsets.GenericViewSet +): + queryset = Starship.objects.all().order_by('pk') + serializer_class = StarshipSerializer + + +class ListingFilter(django_filters.FilterSet): + starship_class = django_filters.CharFilter( + field_name='ship_type__starship_class' + ) + + class Meta: + model = Listing + fields = { + 'active': ['exact'] + } + + +class StableOrderingFilter(OrderingFilter): + """ + This filter maintains a stable sort when ordering by a field + that may have duplicate values by adding a secondary ordering + by pk. This keeps pagination sane. + """ + def get_ordering(self, request, queryset, view): + ordering = super().get_ordering(request, queryset, view) + if ordering and 'pk' not in ordering: + return list(ordering) + ['pk'] + return ordering + + +class ListingView( + mixins.RetrieveModelMixin, mixins.ListModelMixin, + mixins.CreateModelMixin, viewsets.GenericViewSet +): + queryset = Listing.objects.order_by('pk') + filter_backends = (DjangoFilterBackend, StableOrderingFilter,) + filter_class = ListingFilter + serializer_class = ListingSerializer + ordering_fields = ('price', 'last_listed',) + + @decorators.action( + methods=['post'], detail=True, + url_path='activate', url_name='activate' + ) + def activate(self, request, pk=None): + obj = self.get_object() + if not obj.active: + obj.active = True + obj.last_listed = now() + obj.save() + return Response(status=status.HTTP_204_NO_CONTENT) + + @decorators.action( + methods=['post'], detail=True, + url_path='deactivate', url_name='deactivate' + ) + def deactivate(self, request, pk=None): + obj = self.get_object() + obj.active = False + obj.save() + return Response(status=status.HTTP_204_NO_CONTENT) diff --git a/testsite/__init__.py b/testsite/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/testsite/items/admin.py b/testsite/items/admin.py deleted file mode 100644 index debc267..0000000 --- a/testsite/items/admin.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.contrib import admin - -from models import PhotoItem, TweetItem - -admin.site.register(PhotoItem) -admin.site.register(TweetItem) diff --git a/testsite/items/fixtures/sample_data.json b/testsite/items/fixtures/sample_data.json deleted file mode 100644 index 93f6889..0000000 --- a/testsite/items/fixtures/sample_data.json +++ /dev/null @@ -1,47 +0,0 @@ -[ -{ - "fields": { - "created_at": "2015-10-05T12:21:06Z", - "user": 1, - "image": "/media/python-logo-master-v3-TM-flattened.png" - }, - "model": "items.photoitem", - "pk": 1 -}, -{ - "fields": { - "created_at": "2015-10-03T13:06:14Z", - "user": 1, - "image": "/media/python-logo-master-v3-TM-flattened.png" - }, - "model": "items.photoitem", - "pk": 2 -}, -{ - "fields": { - "text": "Had corn flakes for breakfast", - "created_at": "2015-10-02T08:10:10Z", - "user": 1 - }, - "model": "items.tweetitem", - "pk": 1 -}, -{ - "fields": { - "text": "Had salmon for lunch today", - "created_at": "2015-10-04T12:54:43Z", - "user": 1 - }, - "model": "items.tweetitem", - "pk": 2 -}, -{ - "fields": { - "text": "Had a roast beef dinner", - "created_at": "2015-10-04T18:41:47Z", - "user": 1 - }, - "model": "items.tweetitem", - "pk": 3 -} -] diff --git a/testsite/items/migrations/0001_initial.py b/testsite/items/migrations/0001_initial.py deleted file mode 100644 index 9392339..0000000 --- a/testsite/items/migrations/0001_initial.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -from django.conf import settings - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='PhotoItem', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('created_at', models.DateTimeField()), - ('image', models.ImageField(upload_to=b'')), - ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)), - ], - options={ - 'abstract': False, - }, - bases=(models.Model,), - ), - migrations.CreateModel( - name='TweetItem', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('created_at', models.DateTimeField()), - ('text', models.CharField(max_length=150)), - ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)), - ], - options={ - 'abstract': False, - }, - bases=(models.Model,), - ), - ] diff --git a/testsite/items/models.py b/testsite/items/models.py deleted file mode 100644 index 7d7ebe0..0000000 --- a/testsite/items/models.py +++ /dev/null @@ -1,18 +0,0 @@ -from django.db import models -from django.contrib.auth.models import User - - -class ItemAbstract(models.Model): - user = models.ForeignKey(User) - created_at = models.DateTimeField() - - class Meta: - abstract = True - - -class PhotoItem(ItemAbstract): - image = models.ImageField() - - -class TweetItem(ItemAbstract): - text = models.CharField(max_length=150) diff --git a/testsite/items/tests.py b/testsite/items/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/testsite/items/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/testsite/items/views.py b/testsite/items/views.py deleted file mode 100644 index 91ea44a..0000000 --- a/testsite/items/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/testsite/manage.py b/testsite/manage.py deleted file mode 100755 index 4671d39..0000000 --- a/testsite/manage.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python -import os -import sys - -if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testsite.settings") - - from django.core.management import execute_from_command_line - - execute_from_command_line(sys.argv) diff --git a/testsite/media/python-logo-master-v3-TM-flattened.png b/testsite/media/python-logo-master-v3-TM-flattened.png deleted file mode 100644 index 738f6ed..0000000 Binary files a/testsite/media/python-logo-master-v3-TM-flattened.png and /dev/null differ diff --git a/testsite/settings.py b/testsite/settings.py new file mode 100644 index 0000000..aa1586b --- /dev/null +++ b/testsite/settings.py @@ -0,0 +1,138 @@ +""" +Django settings for testsite project. + +Generated by 'django-admin startproject' using Django 1.11.8. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/1.11/ref/settings/ +""" + +import os + +DOCKER = os.getenv('USER') != 'ubuntu' + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'a-z$8$66fyjy01^328r$5nmj=bzz2a8m%^-kf403!(ohrg5k_b' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'shiptrader', + 'rest_framework', + 'django_filters', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'testsite.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'testsite.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/1.11/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'postgres', + } +} + +if DOCKER: + DATABASES['default']['NAME'] = 'postgres' + DATABASES['default']['HOST'] = 'postgresql' + DATABASES['default']['USER'] = 'postgres' + DATABASES['default']['PASSWORD'] = 'postgres' + + +# Password validation +# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/1.11/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/1.11/howto/static-files/ + +STATIC_URL = '/static/' + +STARSHIP_API_PATH = 'https://swapi.co/api/starships/' + +REST_FRAMEWORK = { + 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination', + 'PAGE_SIZE': 20 +} diff --git a/testsite/stream/admin.py b/testsite/stream/admin.py deleted file mode 100644 index 54a2562..0000000 --- a/testsite/stream/admin.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.contrib import admin - -from models import Stream - -admin.site.register(Stream) diff --git a/testsite/stream/migrations/0001_initial.py b/testsite/stream/migrations/0001_initial.py deleted file mode 100644 index 30d7667..0000000 --- a/testsite/stream/migrations/0001_initial.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -from django.conf import settings - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Stream', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('created_at', models.DateTimeField()), - ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)), - ], - options={ - }, - bases=(models.Model,), - ), - ] diff --git a/testsite/stream/migrations/0002_auto_20151005_1926.py b/testsite/stream/migrations/0002_auto_20151005_1926.py deleted file mode 100644 index d598f0a..0000000 --- a/testsite/stream/migrations/0002_auto_20151005_1926.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('contenttypes', '0001_initial'), - ('stream', '0001_initial'), - ] - - operations = [ - migrations.AlterModelOptions( - name='stream', - options={'ordering': ['-created_at']}, - ), - migrations.AddField( - model_name='stream', - name='content_type', - field=models.ForeignKey(default=36, to='contenttypes.ContentType'), - preserve_default=False, - ), - migrations.AddField( - model_name='stream', - name='object_id', - field=models.PositiveIntegerField(default=1), - preserve_default=False, - ), - ] diff --git a/testsite/stream/migrations/0003_stream_deleted.py b/testsite/stream/migrations/0003_stream_deleted.py deleted file mode 100644 index bc449e8..0000000 --- a/testsite/stream/migrations/0003_stream_deleted.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('stream', '0002_auto_20151005_1926'), - ] - - operations = [ - migrations.AddField( - model_name='stream', - name='deleted', - field=models.BooleanField(default=False), - preserve_default=True, - ), - ] diff --git a/testsite/stream/models.py b/testsite/stream/models.py deleted file mode 100644 index 082d7bd..0000000 --- a/testsite/stream/models.py +++ /dev/null @@ -1,46 +0,0 @@ -from django.db import models -from django.contrib.auth.models import User -from django.contrib.contenttypes.fields import GenericForeignKey -from django.contrib.contenttypes.models import ContentType -from django.db.models import signals - -from items.models import PhotoItem, TweetItem - - -class NotDeletedStreamManager(models.Manager): - def get_queryset(self): - return super(NotDeletedStreamManager, self).get_queryset().filter(deleted=False) - - -class Stream(models.Model): - user = models.ForeignKey(User) - created_at = models.DateTimeField() - - content_type = models.ForeignKey(ContentType) - object_id = models.PositiveIntegerField() - content_object = GenericForeignKey() - - deleted = models.BooleanField(default=False) - - class Meta: - ordering = ['-created_at'] - - objects = models.Manager() - active = NotDeletedStreamManager() - - def __unicode__(self): - return '{} {}: {}'.format(self.__class__.__name__, - self.content_type.model, - self.created_at) - - -def update_stream(sender, instance, created, **kwargs): - if created: - Stream.objects.create( - user=instance.user, - created_at=instance.created_at, - content_type=ContentType.objects.get_for_model(sender), - object_id=instance.id) - -for item_type in (TweetItem, PhotoItem): - signals.post_save.connect(update_stream, sender=item_type) \ No newline at end of file diff --git a/testsite/stream/tests.py b/testsite/stream/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/testsite/stream/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/testsite/stream/views.py b/testsite/stream/views.py deleted file mode 100644 index 664421c..0000000 --- a/testsite/stream/views.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.shortcuts import render - -from models import Stream - -def stream(request): - return render(request, 'stream.html', - {'stream': Stream.active.all()}) diff --git a/testsite/testsite/fixtures/auth_data.json b/testsite/testsite/fixtures/auth_data.json deleted file mode 100644 index 7b2d40f..0000000 --- a/testsite/testsite/fixtures/auth_data.json +++ /dev/null @@ -1,263 +0,0 @@ -[ -{ - "fields": { - "codename": "add_logentry", - "name": "Can add log entry", - "content_type": 1 - }, - "model": "auth.permission", - "pk": 1 -}, -{ - "fields": { - "codename": "change_logentry", - "name": "Can change log entry", - "content_type": 1 - }, - "model": "auth.permission", - "pk": 2 -}, -{ - "fields": { - "codename": "delete_logentry", - "name": "Can delete log entry", - "content_type": 1 - }, - "model": "auth.permission", - "pk": 3 -}, -{ - "fields": { - "codename": "add_permission", - "name": "Can add permission", - "content_type": 2 - }, - "model": "auth.permission", - "pk": 4 -}, -{ - "fields": { - "codename": "change_permission", - "name": "Can change permission", - "content_type": 2 - }, - "model": "auth.permission", - "pk": 5 -}, -{ - "fields": { - "codename": "delete_permission", - "name": "Can delete permission", - "content_type": 2 - }, - "model": "auth.permission", - "pk": 6 -}, -{ - "fields": { - "codename": "add_group", - "name": "Can add group", - "content_type": 3 - }, - "model": "auth.permission", - "pk": 7 -}, -{ - "fields": { - "codename": "change_group", - "name": "Can change group", - "content_type": 3 - }, - "model": "auth.permission", - "pk": 8 -}, -{ - "fields": { - "codename": "delete_group", - "name": "Can delete group", - "content_type": 3 - }, - "model": "auth.permission", - "pk": 9 -}, -{ - "fields": { - "codename": "add_user", - "name": "Can add user", - "content_type": 4 - }, - "model": "auth.permission", - "pk": 10 -}, -{ - "fields": { - "codename": "change_user", - "name": "Can change user", - "content_type": 4 - }, - "model": "auth.permission", - "pk": 11 -}, -{ - "fields": { - "codename": "delete_user", - "name": "Can delete user", - "content_type": 4 - }, - "model": "auth.permission", - "pk": 12 -}, -{ - "fields": { - "codename": "add_contenttype", - "name": "Can add content type", - "content_type": 5 - }, - "model": "auth.permission", - "pk": 13 -}, -{ - "fields": { - "codename": "change_contenttype", - "name": "Can change content type", - "content_type": 5 - }, - "model": "auth.permission", - "pk": 14 -}, -{ - "fields": { - "codename": "delete_contenttype", - "name": "Can delete content type", - "content_type": 5 - }, - "model": "auth.permission", - "pk": 15 -}, -{ - "fields": { - "codename": "add_session", - "name": "Can add session", - "content_type": 6 - }, - "model": "auth.permission", - "pk": 16 -}, -{ - "fields": { - "codename": "change_session", - "name": "Can change session", - "content_type": 6 - }, - "model": "auth.permission", - "pk": 17 -}, -{ - "fields": { - "codename": "delete_session", - "name": "Can delete session", - "content_type": 6 - }, - "model": "auth.permission", - "pk": 18 -}, -{ - "fields": { - "codename": "add_stream", - "name": "Can add stream", - "content_type": 7 - }, - "model": "auth.permission", - "pk": 19 -}, -{ - "fields": { - "codename": "change_stream", - "name": "Can change stream", - "content_type": 7 - }, - "model": "auth.permission", - "pk": 20 -}, -{ - "fields": { - "codename": "delete_stream", - "name": "Can delete stream", - "content_type": 7 - }, - "model": "auth.permission", - "pk": 21 -}, -{ - "fields": { - "codename": "add_photoitem", - "name": "Can add photo item", - "content_type": 8 - }, - "model": "auth.permission", - "pk": 22 -}, -{ - "fields": { - "codename": "change_photoitem", - "name": "Can change photo item", - "content_type": 8 - }, - "model": "auth.permission", - "pk": 23 -}, -{ - "fields": { - "codename": "delete_photoitem", - "name": "Can delete photo item", - "content_type": 8 - }, - "model": "auth.permission", - "pk": 24 -}, -{ - "fields": { - "codename": "add_tweetitem", - "name": "Can add tweet item", - "content_type": 9 - }, - "model": "auth.permission", - "pk": 25 -}, -{ - "fields": { - "codename": "change_tweetitem", - "name": "Can change tweet item", - "content_type": 9 - }, - "model": "auth.permission", - "pk": 26 -}, -{ - "fields": { - "codename": "delete_tweetitem", - "name": "Can delete tweet item", - "content_type": 9 - }, - "model": "auth.permission", - "pk": 27 -}, -{ - "fields": { - "username": "admin", - "first_name": "", - "last_name": "", - "is_active": true, - "is_superuser": true, - "is_staff": true, - "last_login": "2015-10-05T18:54:02.247Z", - "groups": [], - "user_permissions": [], - "password": "pbkdf2_sha256$12000$1THWo6CjRL0S$OKr+1Fil+oUQZ8c3LWZm+FEX69V3bzHRenCI9XApyqY=", - "email": "", - "date_joined": "2015-10-05T18:54:02.247Z" - }, - "model": "auth.user", - "pk": 1 -} -] diff --git a/testsite/testsite/settings.py b/testsite/testsite/settings.py deleted file mode 100644 index 31cfe7b..0000000 --- a/testsite/testsite/settings.py +++ /dev/null @@ -1,98 +0,0 @@ -""" -Django settings for testsite project. - -For more information on this file, see -https://docs.djangoproject.com/en/1.7/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.7/ref/settings/ -""" - -# Build paths inside the project like this: os.path.join(BASE_DIR, ...) -import os -BASE_DIR = os.path.dirname(os.path.dirname(__file__)) - - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '!4oojc^tmd%+*c_^(n)7^p^6-0f8td(_o&(2bj*e7demr&jtvy' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -TEMPLATE_DEBUG = True - -ALLOWED_HOSTS = [] - -INSTALLED_APPS = ( - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'stream', - 'items', -) - -MIDDLEWARE_CLASSES = ( - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', -) - -ROOT_URLCONF = 'testsite.urls' - -WSGI_APPLICATION = 'testsite.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/1.7/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'lecodetest', - 'USER': 'devuser', - 'PASSWORD': 'devpass', - 'HOST': '127.0.0.1', - 'PORT': '', - } -} - -TEMPLATE_DIRS = ( - os.path.join(BASE_DIR, 'testsite', 'templates'), -) - -FIXTURE_DIRS = ( - os.path.join(os.path.dirname(__file__), 'fixtures'), -) - -# Internationalization -# https://docs.djangoproject.com/en/1.7/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'UTC' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.7/howto/static-files/ - -STATIC_URL = '/static/' - -MEDIA_URL = '/media/' - -MEDIA_ROOT = os.path.join(BASE_DIR, 'media') diff --git a/testsite/testsite/templates/stream.html b/testsite/testsite/templates/stream.html deleted file mode 100644 index d4b3073..0000000 --- a/testsite/testsite/templates/stream.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - Stream Page - - - - -
- {% for item in stream %} -
-
-
- {% if item.content_type.model == 'photoitem' %} - - {% elif item.content_type.model == 'tweetitem' %} -

{{ item.content_object.text }}

- {% endif %} -
    -
  • {{ item.created_at }}
    • -
-
-
-
- {% endfor %} -
- - \ No newline at end of file diff --git a/testsite/testsite/urls.py b/testsite/testsite/urls.py deleted file mode 100644 index b93c51a..0000000 --- a/testsite/testsite/urls.py +++ /dev/null @@ -1,15 +0,0 @@ -from django.conf.urls import include, url -from django.contrib import admin -from django.conf import settings -from django.conf.urls.static import static - -from stream import views - -urlpatterns = [ - # Examples: - # url(r'^$', 'testsite.views.home', name='home'), - # url(r'^blog/', include('blog.urls')), - - url(r'^admin/', include(admin.site.urls)), - url(r'^stream/', views.stream) -] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/testsite/urls.py b/testsite/urls.py new file mode 100644 index 0000000..3cde729 --- /dev/null +++ b/testsite/urls.py @@ -0,0 +1,22 @@ +"""testsite URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.11/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import url, include +from django.contrib import admin + +urlpatterns = [ + url(r'^admin/', admin.site.urls), + url(r'^api/', include('shiptrader.urls')), +] diff --git a/testsite/testsite/wsgi.py b/testsite/wsgi.py similarity index 83% rename from testsite/testsite/wsgi.py rename to testsite/wsgi.py index 2091485..a65c11b 100644 --- a/testsite/testsite/wsgi.py +++ b/testsite/wsgi.py @@ -4,11 +4,13 @@ It exposes the WSGI callable as a module-level variable named ``application``. For more information on this file, see -https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/ +https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ """ import os -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testsite.settings") from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testsite.settings") + application = get_wsgi_application()