Skip to content

Commit 4abfd4f

Browse files
committed
Add old_id in necessary models
1 parent 76a57de commit 4abfd4f

File tree

5 files changed

+85
-2
lines changed

5 files changed

+85
-2
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 5.1.6 on 2025-04-17 06:15
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('contributor', '0002_initial'),
10+
]
11+
12+
operations = [
13+
migrations.RenameField(
14+
model_name='contributorusergroup',
15+
old_name='old_user_group_id',
16+
new_name='old_id',
17+
),
18+
]

apps/contributor/models.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
# NOTE: Users are created from Apps (Web/Mobile)
1111
class ContributorUser(models.Model):
1212
# NOTE: Sync with firebase
13-
user_id = models.CharField(max_length=30, db_index=True)
13+
user_id = models.CharField(
14+
max_length=30,
15+
db_index=True,
16+
help_text="Firebase User ID",
17+
)
1418
username = models.CharField(max_length=255)
1519
created_at = models.DateTimeField(null=True)
1620
modified_at = models.DateTimeField(null=True)

apps/mapping/models.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ def get_client_type(cls, value: str) -> "MappingSessionClientTypeEnum":
2323

2424

2525
class MappingSession(models.Model):
26+
# FIXME(tnagorra): We might need to skip the indexing
27+
old_id = models.CharField(max_length=30, db_index=True, null=True)
28+
2629
project_task_group = models.ForeignKey(ProjectTaskGroup, on_delete=models.PROTECT)
2730
contributor_user = models.ForeignKey(ContributorUser, on_delete=models.PROTECT)
2831

@@ -38,6 +41,9 @@ def __str__(self):
3841

3942

4043
class MappingSessionResult(models.Model):
44+
# FIXME(tnagorra): We might need to skip the indexing
45+
old_id = models.CharField(max_length=30, db_index=True, null=True)
46+
4147
session = models.ForeignKey(MappingSession, on_delete=models.PROTECT)
4248
project_task = models.ForeignKey(ProjectTask, on_delete=models.PROTECT)
4349
result = models.PositiveSmallIntegerField()
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Generated by Django 5.1.6 on 2025-04-17 06:15
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('project', '0002_initial'),
10+
]
11+
12+
operations = [
13+
migrations.RenameField(
14+
model_name='project',
15+
old_name='old_project_id',
16+
new_name='old_id',
17+
),
18+
migrations.RemoveField(
19+
model_name='project',
20+
name='zoom_level',
21+
),
22+
migrations.AddField(
23+
model_name='project',
24+
name='additional_info_url',
25+
field=models.CharField(blank=True, help_text='Provide an optional link to a resource with additional information on the project', null=True),
26+
),
27+
migrations.AddField(
28+
model_name='project',
29+
name='max_tasks_per_user',
30+
field=models.PositiveSmallIntegerField(blank=True, help_text='How many tasks each user is allowed to work on for this project', null=True),
31+
),
32+
migrations.AlterField(
33+
model_name='project',
34+
name='group_size',
35+
field=models.PositiveSmallIntegerField(help_text='How big should a mapping session be? Group size refers to the number of tasks per mapping session.'),
36+
),
37+
migrations.AlterField(
38+
model_name='project',
39+
name='look_for',
40+
field=models.CharField(help_text='What should the users look for (e.g. buildings, cars, trees)', max_length=255),
41+
),
42+
migrations.AlterField(
43+
model_name='project',
44+
name='verification_number',
45+
field=models.PositiveSmallIntegerField(help_text='How many people do you want to see every tile before you consider it finished?'),
46+
),
47+
]

apps/project/models.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class Project(UserResource):
7575
Type = ProjectTypeEnum
7676
Status = ProjectStatusEnum
7777

78-
old_id = models.CharField(max_length=30, db_index=True, null=True, blank=True) # noqa: DJ001
78+
old_id = models.CharField(max_length=30, db_index=True, null=True, blank=True)
7979

8080
project_type: ProjectTypeEnum = IntegerChoicesField( # type: ignore[reportAssignmentType]
8181
choices_enum=ProjectTypeEnum,
@@ -89,6 +89,8 @@ class Project(UserResource):
8989
help_text=gettext_lazy("Which group, institution or community is requesting this project?"),
9090
)
9191

92+
# TODO: Add uniqueness on project topic? Discuss with PM
93+
9294
# Generate in manager dashboard based on topic, region, project number, requesting org
9395
name = models.CharField(max_length=255)
9496

@@ -201,6 +203,9 @@ def clean(self):
201203

202204

203205
class ProjectTaskGroup(models.Model):
206+
# FIXME(tnagorra): We might need to skip the indexing
207+
old_id = models.CharField(max_length=30, db_index=True, null=True)
208+
204209
project: Project = models.ForeignKey( # type: ignore[reportAssignmentType]
205210
Project,
206211
on_delete=models.CASCADE,
@@ -231,6 +236,9 @@ def __str__(self):
231236

232237

233238
class ProjectTask(models.Model):
239+
# FIXME(tnagorra): We might need to skip the indexing
240+
old_id = models.CharField(max_length=30, db_index=True, null=True)
241+
234242
task_group: ProjectTaskGroup = models.ForeignKey( # type: ignore[reportAssignmentType]
235243
ProjectTaskGroup,
236244
on_delete=models.CASCADE,

0 commit comments

Comments
 (0)