Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"python.pythonPath": "/Users/jb/.local/share/virtualenvs/api-cP68AE47/bin/python"
"python.pythonPath": "/usr/local/bin/python3"
}
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]
pylint = "*"

[packages]
django = "*"
Expand Down
92 changes: 90 additions & 2 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file added mercedes/__init__.py
Empty file.
4 changes: 4 additions & 0 deletions mercedes/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
from django.contrib import admin
from .models import Mercedes
# Register your models here.
admin.site.register(Mercedes)
5 changes: 5 additions & 0 deletions mercedes/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from django.apps import AppConfig


class MercedesConfig(AppConfig):
name = 'mercedes'
30 changes: 30 additions & 0 deletions mercedes/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Generated by Django 2.2.4 on 2019-08-15 23:18

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
('passengers', '0001_initial'),
]

operations = [
migrations.CreateModel(
name='Mercedes',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=256)),
('quote', models.CharField(max_length=1024)),
('money', models.CharField(default=None, max_length=10)),
('carry_on', models.ForeignKey(default=None, on_delete=django.db.models.deletion.SET_DEFAULT, related_name='carry_on', to='passengers.CarryOn')),
('personal_item', models.ForeignKey(default=None, on_delete=django.db.models.deletion.SET_DEFAULT, related_name='personal_item', to='passengers.CarryOn')),
],
options={
'abstract': False,
},
),
]
Empty file added mercedes/migrations/__init__.py
Empty file.
9 changes: 9 additions & 0 deletions mercedes/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from django.db import models
from passengers.models import Passenger

# Create your models here.
class Mercedes(Passenger):
quote = models.CharField(max_length=1024)
money = models.CharField(max_length=10, default=None)
def __str__(self):
return self.name
31 changes: 31 additions & 0 deletions mercedes/tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
from django.test import TestCase
# from passengers.models import Passenger
from .models import Mercedes
from passengers.models import CarryOn

# Create your tests here.
class MercedesTestCase(TestCase):
def setUp(self):
dog = CarryOn.objects.create(name="dog")
phone = CarryOn.objects.create(name="phone")
mercedes = Mercedes.objects.create(name="mercedes", quote="quote", money="millions", personal_item=dog, carry_on=phone)

def test_mercedes_name(self):
mercedes = Mercedes.objects.get(name="mercedes")
self.assertEqual(mercedes.name, "mercedes")

def test_mercedes_quote(self):
mercedes = Mercedes.objects.get(quote="quote")
self.assertEqual(mercedes.quote, "quote")

def test_mercedes_money(self):
mercedes = Mercedes.objects.get(money="millions")
self.assertEqual(mercedes.money, "millions")

def test_mercedes_personal_item(self):
mercedes = Mercedes.objects.get(name="mercedes")
self.assertEqual(mercedes.personal_item.name, "dog")

def test_mercedes_carry_on(self):
mercedes = Mercedes.objects.get(name="mercedes")
self.assertEqual(mercedes.carry_on.name, "phone")
3 changes: 3 additions & 0 deletions mercedes/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.shortcuts import render

# Create your views here.
5 changes: 3 additions & 2 deletions passengers/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 2.2.4 on 2019-08-15 17:44
# Generated by Django 2.2.4 on 2019-08-15 23:17

from django.db import migrations, models

Expand All @@ -12,10 +12,11 @@ class Migration(migrations.Migration):

operations = [
migrations.CreateModel(
name='Passenger',
name='CarryOn',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=256)),
('attack', models.IntegerField(default=100)),
],
),
]
21 changes: 0 additions & 21 deletions passengers/migrations/0002_carryon.py

This file was deleted.

19 changes: 0 additions & 19 deletions passengers/migrations/0003_carryon_item.py

This file was deleted.

18 changes: 0 additions & 18 deletions passengers/migrations/0004_auto_20190815_1802.py

This file was deleted.

23 changes: 0 additions & 23 deletions passengers/migrations/0005_auto_20190815_1820.py

This file was deleted.

28 changes: 0 additions & 28 deletions passengers/migrations/0006_auto_20190815_1826.py

This file was deleted.

16 changes: 0 additions & 16 deletions passengers/migrations/0007_delete_passenger.py

This file was deleted.

6 changes: 6 additions & 0 deletions snakes_on_plane_project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@
'django.contrib.messages',
'django.contrib.staticfiles',
'passengers.apps.PassengersConfig',





'mercedes.apps.MercedesConfig',
]

MIDDLEWARE = [
Expand Down