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": "/home/skybur/.local/share/virtualenvs/api-pUB2aoZM/bin/python"
}
1 change: 1 addition & 0 deletions snakes_on_plane_project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'django.contrib.messages',
'django.contrib.staticfiles',
'passengers.apps.PassengersConfig',
'three_gs.apps.ThreeGsConfig',
]

MIDDLEWARE = [
Expand Down
Empty file added three_gs/__init__.py
Empty file.
5 changes: 5 additions & 0 deletions three_gs/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from django.contrib import admin
from .models import ThreeGs

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


class ThreeGsConfig(AppConfig):
name = 'three_gs'
29 changes: 29 additions & 0 deletions three_gs/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Generated by Django 2.2.4 on 2019-08-15 22:14

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


class Migration(migrations.Migration):

initial = True

dependencies = [
('passengers', '0007_delete_passenger'),
]

operations = [
migrations.CreateModel(
name='ThreeGs',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=256)),
('accessories', models.CharField(max_length=256)),
('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 three_gs/migrations/__init__.py
Empty file.
9 changes: 9 additions & 0 deletions three_gs/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 ThreeGs(Passenger):
accessories = models.CharField(max_length=256)

def descAccessories(self):
return f'I have: {self.accessories}'
21 changes: 21 additions & 0 deletions three_gs/tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
from django.test import TestCase
from passengers.models import CarryOn
from .models import ThreeGs

class Three3GsTestCase(TestCase):
def setUp(self):
rake = CarryOn.objects.create(name="rake")
cell = CarryOn.objects.create(name="cell")
three3 = ThreeGs.objects.create(
name = 'OG',
carry_on = rake,
personal_item = cell,
accessories = 'Gold Chain')

def test_accessories(self):
three3 = ThreeGs.objects.get(name = 'OG')
self.assertEquals(three3.accessories, 'Gold Chain')

def test_descAccessories(self):
three3 = ThreeGs.objects.get(name = 'OG')
self.assertEquals(three3.descAccessories(), 'I have: Gold Chain')
3 changes: 3 additions & 0 deletions three_gs/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.