Skip to content

Commit 02f64ee

Browse files
BrainIsDeadBrainIsDead
committed
The changes made in this commit include:
- Added `0002_link_created_link_modified.py` - Modified `models.py` in the `base` app to add the `TimeStampedModel` base class to the `Link` model. - Added `0003_datasource_created_datasource_modified_and_more.py` - Modified `models.py` in the `datasources` app to add the `TimeStampedModel` base class to the `SourceSubdivision` and `DataSource` models. - Added `0002_alter_signal_options_geography_created_and_more.py` - Added `0003_alter_signal_options.py` - Modified `models.py` in the `signals` app to add the `TimeStampedModel` base class to the `SignalCategory`, `SignalType`, `Pathogen`, `Geography`, and `Signal` models.
1 parent 90fb1b0 commit 02f64ee

File tree

7 files changed

+163
-8
lines changed

7 files changed

+163
-8
lines changed

‎src/base/migrations/0002_link_created_link_modified.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Generated by Django 4.2.3 on 2023-07-31 17:44
2+
3+
import datetime
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('base', '0001_initial'),
11+
]
12+
13+
operations = [
14+
migrations.AddField(
15+
model_name='link',
16+
name='created',
17+
field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2023, 7, 31, 17, 44, 24, 912457, tzinfo=datetime.timezone.utc)),
18+
preserve_default=False,
19+
),
20+
migrations.AddField(
21+
model_name='link',
22+
name='modified',
23+
field=models.DateTimeField(auto_now=True),
24+
),
25+
]

‎src/base/models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from django.db import models
22
from django.utils.translation import gettext_lazy as _
33
from linkpreview import LinkPreview, link_preview
4+
from models_extensions.models import TimeStampedModel
45

56

67
class LinkTypeChoices(models.TextChoices):
@@ -19,7 +20,7 @@ class LinkTypeChoices(models.TextChoices):
1920
OTHER = 'other', _('Other')
2021

2122

22-
class Link(models.Model):
23+
class Link(TimeStampedModel):
2324
"""
2425
A model representing a Link.
2526
"""

‎src/datasources/migrations/0003_datasource_created_datasource_modified_and_more.py

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Generated by Django 4.2.3 on 2023-07-31 17:44
2+
3+
import datetime
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('datasources', '0002_alter_sourcesubdivision_db_source'),
11+
]
12+
13+
operations = [
14+
migrations.AddField(
15+
model_name='datasource',
16+
name='created',
17+
field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2023, 7, 31, 17, 44, 34, 344934, tzinfo=datetime.timezone.utc)),
18+
preserve_default=False,
19+
),
20+
migrations.AddField(
21+
model_name='datasource',
22+
name='modified',
23+
field=models.DateTimeField(auto_now=True),
24+
),
25+
migrations.AddField(
26+
model_name='sourcesubdivision',
27+
name='created',
28+
field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2023, 7, 31, 17, 44, 38, 5382, tzinfo=datetime.timezone.utc)),
29+
preserve_default=False,
30+
),
31+
migrations.AddField(
32+
model_name='sourcesubdivision',
33+
name='modified',
34+
field=models.DateTimeField(auto_now=True),
35+
),
36+
]

‎src/datasources/models.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
from django.db import models
22
from django.utils.translation import gettext_lazy as _
3+
from models_extensions.models import TimeStampedModel
34

45

5-
class SourceSubdivision(models.Model):
6+
class SourceSubdivision(TimeStampedModel):
67
"""
78
A model representing a source subdivision.
89
"""
@@ -48,7 +49,7 @@ def __str__(self) -> str:
4849
return self.name
4950

5051

51-
class DataSource(models.Model):
52+
class DataSource(TimeStampedModel):
5253
"""
5354
A model representing a data source.
5455
"""

‎src/signals/migrations/0002_alter_signal_options_geography_created_and_more.py

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# Generated by Django 4.2.3 on 2023-07-31 17:44
2+
3+
import datetime
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('signals', '0001_initial'),
11+
]
12+
13+
operations = [
14+
migrations.AlterModelOptions(
15+
name='signal',
16+
options={'ordering': ['name']},
17+
),
18+
migrations.AddField(
19+
model_name='geography',
20+
name='created',
21+
field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2023, 7, 31, 17, 44, 40, 707597, tzinfo=datetime.timezone.utc)),
22+
preserve_default=False,
23+
),
24+
migrations.AddField(
25+
model_name='geography',
26+
name='modified',
27+
field=models.DateTimeField(auto_now=True),
28+
),
29+
migrations.AddField(
30+
model_name='pathogen',
31+
name='created',
32+
field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2023, 7, 31, 17, 44, 44, 129432, tzinfo=datetime.timezone.utc)),
33+
preserve_default=False,
34+
),
35+
migrations.AddField(
36+
model_name='pathogen',
37+
name='modified',
38+
field=models.DateTimeField(auto_now=True),
39+
),
40+
migrations.AddField(
41+
model_name='signal',
42+
name='created',
43+
field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2023, 7, 31, 17, 44, 46, 984631, tzinfo=datetime.timezone.utc)),
44+
preserve_default=False,
45+
),
46+
migrations.AddField(
47+
model_name='signal',
48+
name='modified',
49+
field=models.DateTimeField(auto_now=True),
50+
),
51+
migrations.AddField(
52+
model_name='signalcategory',
53+
name='created',
54+
field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2023, 7, 31, 17, 44, 49, 753035, tzinfo=datetime.timezone.utc)),
55+
preserve_default=False,
56+
),
57+
migrations.AddField(
58+
model_name='signalcategory',
59+
name='modified',
60+
field=models.DateTimeField(auto_now=True),
61+
),
62+
migrations.AddField(
63+
model_name='signaltype',
64+
name='created',
65+
field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2023, 7, 31, 17, 44, 51, 932486, tzinfo=datetime.timezone.utc)),
66+
preserve_default=False,
67+
),
68+
migrations.AddField(
69+
model_name='signaltype',
70+
name='modified',
71+
field=models.DateTimeField(auto_now=True),
72+
),
73+
]

‎src/signals/migrations/0003_alter_signal_options.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Generated by Django 4.2.3 on 2023-07-31 17:46
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('signals', '0002_alter_signal_options_geography_created_and_more'),
10+
]
11+
12+
operations = [
13+
migrations.AlterModelOptions(
14+
name='signal',
15+
options={'ordering': ['modified']},
16+
),
17+
]

‎src/signals/models.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from django.core.exceptions import ValidationError
22
from django.db import models
33
from django.utils.translation import gettext_lazy as _
4+
from models_extensions.models import TimeStampedModel
45

56

67
class TimeTypeChoices(models.TextChoices):
@@ -40,7 +41,7 @@ class HighValuesAreChoices(models.TextChoices):
4041
NEUTRAL = 'neutral', _('Neutral')
4142

4243

43-
class SignalCategory(models.Model):
44+
class SignalCategory(TimeStampedModel):
4445
"""
4546
A model representing a signal category.
4647
"""
@@ -63,7 +64,7 @@ def __str__(self) -> str:
6364
return self.name
6465

6566

66-
class SignalType(models.Model):
67+
class SignalType(TimeStampedModel):
6768
"""
6869
A model representing a signal type.
6970
"""
@@ -86,7 +87,7 @@ def __str__(self) -> str:
8687
return self.name
8788

8889

89-
class Pathogen(models.Model):
90+
class Pathogen(TimeStampedModel):
9091
"""
9192
A model representing a pathogen.
9293
"""
@@ -106,7 +107,7 @@ def __str__(self) -> str:
106107
return self.name
107108

108109

109-
class Geography(models.Model):
110+
class Geography(TimeStampedModel):
110111
"""
111112
A model representing a available geography.
112113
"""
@@ -130,7 +131,7 @@ def __str__(self) -> str:
130131
return self.name
131132

132133

133-
class Signal(models.Model):
134+
class Signal(TimeStampedModel):
134135
"""
135136
A model representing a signal.
136137
"""
@@ -241,6 +242,7 @@ class Signal(models.Model):
241242

242243
class Meta:
243244
unique_together = ['name', 'source']
245+
ordering: list[str] = ["modified"]
244246

245247
def __str__(self) -> str:
246248
"""

0 commit comments

Comments
 (0)