Skip to content

Commit

Permalink
fixes entry
Browse files Browse the repository at this point in the history
  • Loading branch information
hudaifasaleh committed Jun 25, 2023
1 parent 737bf0a commit 38cdcd3
Show file tree
Hide file tree
Showing 10 changed files with 108 additions and 8 deletions.
9 changes: 8 additions & 1 deletion dailyInbox/entries/admin.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
from django.contrib import admin

# Register your models here.
from dailyInbox.entries.models import Entry


@admin.register(Entry)
class EntryAdmin(admin.ModelAdmin):
raw_id_fields = ("user", )
list_display = ("id", "user", "when", )
list_filter = ("when", )
21 changes: 21 additions & 0 deletions dailyInbox/entries/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 4.2.2 on 2023-06-25 15:48

from django.db import migrations, models


class Migration(migrations.Migration):

initial = True

dependencies = [
]

operations = [
migrations.CreateModel(
name='Entry',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('body', models.TextField()),
],
),
]
29 changes: 29 additions & 0 deletions dailyInbox/entries/migrations/0002_entry_user_entry_when.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Generated by Django 4.2.2 on 2023-06-25 18:11

import datetime
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('entries', '0001_initial'),
]

operations = [
migrations.AddField(
model_name='entry',
name='user',
field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='entries', to=settings.AUTH_USER_MODEL),
preserve_default=False,
),
migrations.AddField(
model_name='entry',
name='when',
field=models.DateField(default=datetime.datetime(2023, 6, 25, 18, 11, 25, 248771, tzinfo=datetime.timezone.utc)),
preserve_default=False,
),
]
17 changes: 17 additions & 0 deletions dailyInbox/entries/migrations/0003_alter_entry_options.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 4.2.2 on 2023-06-25 18:40

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('entries', '0002_entry_user_entry_when'),
]

operations = [
migrations.AlterModelOptions(
name='entry',
options={'verbose_name': 'entries', 'verbose_name_plural': 'entries'},
),
]
11 changes: 10 additions & 1 deletion dailyInbox/entries/models.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
from django.db import models

# Create your models here.

class Entry(models.Model):
"""An entry store's the user's written for the day"""
body = models.TextField()
when = models.DateField()
user = models.ForeignKey("accounts.User", on_delete=models.CASCADE, related_name="entries")

class Meta:
verbose_name = 'entries'
verbose_name_plural = 'entries'
3 changes: 0 additions & 3 deletions dailyInbox/entries/tests.py

This file was deleted.

Empty file.
12 changes: 12 additions & 0 deletions dailyInbox/entries/tests/factories.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import datetime

import factory


class EntriesFactory(factory.django.DjangoModelFactory):
class Meta:
model = "entries.Entry"

body = factory.Faker('paragraph')
when = factory.LazyFunction(datetime.date.today)
user = factory.SubFactory("dailyInbox.accounts.tests.factories.UserFactory")
11 changes: 11 additions & 0 deletions dailyInbox/entries/tests/test_models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
from dailyInbox.entries.tests.factories import EntriesFactory


class TestEntry:
def test_factory(self):
"""the factory produces a valid dailyInbox"""
entry = EntriesFactory()

assert entry.body != ""
assert entry.when is not None
assert entry.user is not None
3 changes: 0 additions & 3 deletions dailyInbox/entries/views.py
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
from django.shortcuts import render

# Create your views here.

0 comments on commit 38cdcd3

Please sign in to comment.