Skip to content

Commit 1c67f12

Browse files
committed
renamed RuleGroup model to RuleSet
1 parent 6a9b1ae commit 1c67f12

File tree

16 files changed

+74
-153
lines changed

16 files changed

+74
-153
lines changed

api_v2/admin.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,5 @@ class LanguageAdmin(admin.ModelAdmin):
9898

9999
admin.site.register(Environment)
100100

101-
admin.site.register(Rule)
101+
admin.site.register(Rule)
102+
admin.site.register(RuleSet)
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Generated by Django 5.1.1 on 2024-10-08 21:31
2+
3+
import django.db.models.deletion
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('api_v2', '0001_initial'),
11+
]
12+
13+
operations = [
14+
migrations.CreateModel(
15+
name='RuleGroup',
16+
fields=[
17+
('name', models.CharField(help_text='Name of the item.', max_length=100)),
18+
('desc', models.TextField(help_text='Description of the game content item. Markdown.')),
19+
('key', models.CharField(help_text='Unique key for the Document.', max_length=100, primary_key=True, serialize=False)),
20+
('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.document')),
21+
],
22+
options={
23+
'abstract': False,
24+
},
25+
),
26+
migrations.CreateModel(
27+
name='Rule',
28+
fields=[
29+
('name', models.CharField(help_text='Name of the item.', max_length=100)),
30+
('desc', models.TextField(help_text='Description of the game content item. Markdown.')),
31+
('key', models.CharField(help_text='Unique key for the Document.', max_length=100, primary_key=True, serialize=False)),
32+
('index', models.IntegerField(default=1)),
33+
('initialHeaderLevel', models.IntegerField(choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5)], default=1)),
34+
('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api_v2.document')),
35+
('ruleset', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rules', to='api_v2.rulegroup')),
36+
],
37+
options={
38+
'abstract': False,
39+
},
40+
),
41+
]
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Generated by Django 5.1.1 on 2024-10-08 21:38
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('api_v2', '0002_rulegroup_rule'),
10+
]
11+
12+
operations = [
13+
migrations.RenameModel(
14+
old_name='RuleGroup',
15+
new_name='RuleSet',
16+
),
17+
]

api_v2/migrations/0114_rule.py

Lines changed: 0 additions & 27 deletions
This file was deleted.

api_v2/migrations/0115_auto_20240925_0917.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

api_v2/migrations/0116_alter_rule_next.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

api_v2/migrations/0117_rule_document.py

Lines changed: 0 additions & 20 deletions
This file was deleted.

api_v2/migrations/0118_auto_20241008_1206.py

Lines changed: 0 additions & 41 deletions
This file was deleted.

api_v2/models/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@
5858

5959
from .speed import HasSpeed
6060

61-
from .rules import Rule, RuleGroup
61+
from .rules import Rule, RuleSet

api_v2/models/rules.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22
from .abstracts import HasName, HasDescription, key_field
33
from .document import FromDocument
44

5-
6-
# TODO it has been agreed that this model should be called 'RuleSet' and that
7-
# existant the 'RuleSet' should be renamed to 'GameSystem'.
8-
#
9-
# This change be handled in its own PR, as it represents a significant
10-
# expansion of the initial issue and will likely touch many files, causing
11-
# headaches for whichever poor soul ends up reviewing it
12-
13-
class RuleGroup(HasName, HasDescription, FromDocument):
5+
class RuleSet(HasName, HasDescription, FromDocument):
146
"""
157
The RuleGroup model contains a set of Rules as part of a larger article, or
168
as a chapter of a book.
@@ -26,7 +18,7 @@ class Rule(HasName, HasDescription, FromDocument):
2618
key = key_field()
2719
index = models.IntegerField(default=1)
2820
ruleset = models.ForeignKey(
29-
RuleGroup,
21+
RuleSet,
3022
on_delete=models.CASCADE,
3123
related_name='rules'
3224
)

0 commit comments

Comments
 (0)