Skip to content

Commit 7c69c66

Browse files
committed
feat(street): Add max time spend percentile
- Merge migrations with develop
1 parent 13296c1 commit 7c69c66

File tree

11 files changed

+7
-56
lines changed

11 files changed

+7
-56
lines changed

apps/project/factories.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ class Meta:
5454
firebase_id = factory.LazyFunction(lambda: str(ULID()))
5555
project_type_specifics = factory.LazyAttribute(lambda _: {})
5656
number_of_tasks = 100
57-
number_of_groups = 10
5857
required_count = 50
5958

6059
finished_count = 50

apps/project/migrations/0017_projecttaskgroup_number_of_groups.py

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

apps/project/migrations/0020_merge_20250822_0627.py

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

apps/project/migrations/0021_merge_20250825_0551.py

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

apps/project/models.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ class ProjectTaskGroup(FirebasePushResource):
508508

509509
number_of_tasks = models.IntegerField[int, int]()
510510
required_count = models.IntegerField[int, int]()
511-
number_of_groups = models.IntegerField[int, int]()
512511

513512
finished_count = models.IntegerField[int, int](default=0)
514513
progress = models.PositiveSmallIntegerField[int, int](default=0, validators=[validate_percentage])

project_types/base/project.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ def analyze_groups(self):
9292

9393
project_task_groups_qs = ProjectTaskGroup.objects.filter(project_id=self.project.pk)
9494
project_task_groups_qs.update(
95-
number_of_groups=project_task_groups_qs.count(),
9695
number_of_tasks=models.Subquery(
9796
ProjectTask.objects.filter(task_group_id=models.OuterRef("id"))
9897
.values("task_group_id")

project_types/street/project.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ def create_groups(self, resp: StreetRawGroupItem):
140140
firebase_id=f"g{group_id}",
141141
project_id=self.project.pk,
142142
number_of_tasks=0,
143-
number_of_groups=0,
144143
progress=0,
145144
finished_count=0,
146145
required_count=0,
@@ -197,6 +196,10 @@ def get_feature(task: ProjectTask):
197196
self.project.project_type_specific_output = asset
198197
self.project.save(update_fields=("project_type_specific_output",))
199198

199+
@typing.override
200+
def get_max_time_spend_percentile(self) -> float:
201+
return 65
202+
200203
# FIREBASE
201204

202205
@typing.override
@@ -215,13 +218,14 @@ def get_task_specifics_for_firebase(self, task: ProjectTask):
215218
def get_group_specifics_for_firebase(self, group: ProjectTaskGroup):
216219
return firebase_models.FbMappingGroupStreetCreateOnlyInput(
217220
groupId=group.firebase_id,
218-
numberOfGroups=group.number_of_groups,
219221
)
220222

221223
@typing.override
222224
def get_project_specifics_for_firebase(self):
223225
custom_opts = self.project_type_specifics.custom_options
226+
number_of_groups = ProjectTaskGroup.objects.filter(project=self.project).count()
224227
return firebase_models.FbProjectStreetCreateOnlyInput(
228+
numberOfGroups=number_of_groups,
225229
customOptions=[
226230
firebase_models.FbObjCustomOption(
227231
title=opt.title,

project_types/tile_map_service/base/project.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ def create_groups(self, resp: tile_grouping.AoiGeometry):
198198
firebase_id=group_key,
199199
project_id=self.project.pk,
200200
number_of_tasks=0,
201-
number_of_groups=0,
202201
progress=0,
203202
finished_count=0,
204203
required_count=0,

project_types/validate/project.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ def create_groups(self, resp: list[ValidFeature]):
296296
firebase_id=group_key,
297297
project_id=self.project.pk,
298298
number_of_tasks=0,
299-
number_of_groups=0,
300299
progress=0,
301300
finished_count=0,
302301
required_count=0,

0 commit comments

Comments
 (0)