Merge pull request #87 from toggle-corp/project/better-journaling

Project: Better journaling

Author: tnagorra

apps/common/filters.py

@@ -1,5 +1,6 @@
 import strawberry
 import strawberry_django
+from django.db import models
 
 from .enums import EventTypeEnum
 from .models import Event
@@ -10,4 +11,12 @@ class EventFilter:
     id: strawberry.auto
     start_date: strawberry.auto
     end_date: strawberry.auto
-    types: list[EventTypeEnum]  # type: ignore[reportInvalidTypeForm]
+
+    @strawberry_django.filter_field
+    def types(
+        self,
+        queryset: models.QuerySet,
+        value: list[EventTypeEnum],  # type: ignore[reportInvalidTypeForm]
+        prefix: str,
+    ) -> tuple[models.QuerySet, models.Q]:
+        return queryset, models.Q(**{f"{prefix}type__in": value})

apps/project/filters.py

@@ -1,7 +1,7 @@
 import strawberry
 import strawberry_django
 
-from .models import Client, Contractor, Project
+from .models import Client, Contractor, Deadline, Project
 
 
 @strawberry_django.filters.filter(Client, lookups=True)
@@ -21,3 +21,10 @@ class ProjectFilter:
     id: strawberry.auto
     project_client: strawberry.auto
     contractor: strawberry.auto
+
+
+@strawberry_django.filters.filter(Deadline, lookups=True)
+class DeadlineFilter:
+    id: strawberry.auto
+    end_date: strawberry.auto
+    is_archived: strawberry.auto

apps/project/queries.py

@@ -1,10 +1,11 @@
 import strawberry
 import strawberry_django
+from strawberry_django.filters import apply as apply_filters
 
 from main.graphql.context import Info
 from utils.strawberry.paginations import CountList, pagination_field
 
-from .filters import ClientFilter, ContractorFilter, ProjectFilter
+from .filters import ClientFilter, ContractorFilter, DeadlineFilter, ProjectFilter
 from .orders import ClientOrder, ContractorOrder, ProjectOrder
 from .types import ClientType, ContractorType, DeadlineType, ProjectType
 
@@ -37,8 +38,13 @@ async def all_projects(self, info: Info) -> list[ProjectType]:
         return [project async for project in qs]
 
     @strawberry_django.field
-    async def all_deadlines(self, info: Info) -> list[DeadlineType]:
-        qs = DeadlineType.get_queryset(None, None, info).filter(is_archived=False).all()
+    async def all_deadlines(self, info: Info, filters: DeadlineFilter | None = None) -> list[DeadlineType]:
+        # NOTE: filters is temporarily optional
+        qs = DeadlineType.get_queryset(None, None, info)
+        if filters is None or filters.is_archived is strawberry.UNSET:
+            qs = qs.filter(is_archived=False)
+        if filters is not None:
+            qs = apply_filters(filters, qs, info, None)
         return [deadline async for deadline in qs]
 
     # Single ----------------------------

apps/project/types.py

@@ -78,6 +78,7 @@ class ProjectType(UserResourceTypeMixin):
     contractor_id: strawberry.ID
 
     name = string_field(Project.name)
+    short_name = string_field(Project.short_name)
     description = string_field(Project.description)
 
     @staticmethod

apps/track/queries.py

@@ -2,6 +2,8 @@
 
 import strawberry
 import strawberry_django
+from django.db.models import IntegerField, Sum, Value
+from django.db.models.functions import Coalesce
 from strawberry_django.filters import apply as apply_filters
 
 from main.graphql.context import Info
@@ -11,7 +13,7 @@
 # from .enums import TimeEntryDateFilterEnum
 from .filters import ContractFilter, TaskFilter, TimeEntryFilter
 from .orders import ContractOrder, TaskOrder, TimeEntryOrder
-from .types import ContractType, TaskType, TimeEntryType
+from .types import ContractType, DailySummaryType, TaskType, TimeEntryType
 
 # from django.db import models
 
@@ -91,6 +93,79 @@ async def all_time_entries(
             raise Exception(f"Try using filters. To much data to return (Row count: {count})")
         return [time_entry async for time_entry in queryset]
 
+    @strawberry_django.field(
+        description="Return total minutes and target minutes per day for the user within the given date range.",
+    )
+    async def daily_summary(
+        self,
+        info: Info,
+        date_gte: datetime.date,
+        date_lte: datetime.date,
+    ) -> list[DailySummaryType]:
+        from apps.common.models import Event
+        from apps.journal.models import Journal
+
+        from .models import TimeEntry
+
+        # Recorded minutes per date
+        qs = (
+            TimeEntry.objects.filter(
+                user=info.context.request.user,
+                date__gte=date_gte,
+                date__lte=date_lte,
+            )
+            .values("date")
+            .annotate(total_minutes=Coalesce(Sum("duration"), Value(0), output_field=IntegerField()))
+            .order_by("date")
+        )
+        recorded_map: dict[datetime.date, int] = {}
+        async for row in qs:
+            recorded_map[row["date"]] = row["total_minutes"]
+
+        # Holiday / non-working event dates (cached)
+        non_working_dates = set(await Event.aget_relative_event_dates())
+
+        # User journal entries (leave + wfh) in range
+        journal_qs = Journal.objects.filter(
+            user=info.context.request.user,
+            date__gte=date_gte,
+            date__lte=date_lte,
+        ).values("date", "leave_type", "wfh_type")
+        journal_map: dict[datetime.date, dict] = {}
+        async for row in journal_qs:
+            journal_map[row["date"]] = row
+
+        # Build one entry per day in the range
+        result: list[DailySummaryType] = []
+
+        total_days = (date_lte - date_gte).days + 1
+        for offset in range(total_days):
+            date = date_gte + datetime.timedelta(days=offset)
+            journal = journal_map.get(date, {})
+            leave_type = journal.get("leave_type")
+            wfh_type = journal.get("wfh_type")
+            is_weekend = Event.is_weekend(date)
+            is_holiday = not is_weekend and date in non_working_dates
+
+            if is_weekend or is_holiday or leave_type == Journal.LeaveType.FULL:
+                target = 0
+            elif leave_type in (Journal.LeaveType.FIRST_HALF, Journal.LeaveType.SECOND_HALF):
+                target = int(3.5 * 60)
+            else:
+                target = 7 * 60
+
+            result.append(
+                DailySummaryType(
+                    date=date,
+                    total_minutes=recorded_map.get(date, 0),
+                    target_minutes=target,
+                    is_holiday=is_holiday,
+                    leave_type=leave_type,
+                    wfh_type=wfh_type,
+                ),
+            )
+        return result
+
     # Single ----------------------------
     @strawberry_django.field
     async def contract(self, info: Info, pk: strawberry.ID) -> ContractType | None:

apps/track/types.py

@@ -1,8 +1,11 @@
+import datetime
+
 import strawberry
 import strawberry_django
 from django.db import models
 
 from apps.common.types import ClientIdMixin, UserResourceTypeMixin
+from apps.journal.enums import JournalLeaveTypeEnum, JournalWorkFromHomeTypeEnum
 from apps.project.types import ProjectType
 from apps.user.types import UserType
 from main.graphql.context import Info
@@ -13,6 +16,20 @@
 from .models import Contract, Task, TimeEntry
 
 
+@strawberry.type
+class DailySummaryType:
+    date: datetime.date
+    total_minutes: int
+    target_minutes: int
+    is_holiday: bool
+    leave_type: JournalLeaveTypeEnum | None  # type: ignore[reportInvalidTypeForm]
+    wfh_type: JournalWorkFromHomeTypeEnum | None  # type: ignore[reportInvalidTypeForm]
+
+    @strawberry.field
+    def id(self) -> strawberry.ID:
+        return strawberry.ID(self.date.isoformat())
+
+
 @strawberry_django.type(Contract)
 class ContractType(UserResourceTypeMixin):
     id: strawberry.ID

schema.graphql

@@ -184,6 +184,16 @@ type DailyStandUpType {
   projectStat(pk: ID!): DailyStandUpProjectStatType
 }
 
+type DailySummaryType {
+  date: Date!
+  totalMinutes: Int!
+  targetMinutes: Int!
+  isHoliday: Boolean!
+  leaveType: JournalLeaveTypeEnum
+  wfhType: JournalWorkFromHomeTypeEnum
+  id: ID!
+}
+
 """Date (isoformat)"""
 scalar Date
 
@@ -231,6 +241,16 @@ input DateRangeLookup {
 """Date with time (isoformat)"""
 scalar DateTime
 
+input DeadlineFilter {
+  id: IDBaseFilterLookup
+  endDate: DateDateFilterLookup
+  isArchived: BoolBaseFilterLookup
+  AND: DeadlineFilter
+  OR: DeadlineFilter
+  NOT: DeadlineFilter
+  DISTINCT: Boolean
+}
+
 type DeadlineType implements UserResourceTypeMixin {
   createdAt: DateTime!
   modifiedAt: DateTime!
@@ -265,11 +285,11 @@ input EventFilter {
   id: IDBaseFilterLookup
   startDate: DateDateFilterLookup
   endDate: DateDateFilterLookup
-  types: [EventTypeEnum!]!
   AND: EventFilter
   OR: EventFilter
   NOT: EventFilter
   DISTINCT: Boolean
+  types: [EventTypeEnum!]
 }
 
 input EventOrder {
@@ -436,7 +456,7 @@ type PrivateQuery {
   contractors(filters: ContractorFilter, order: ContractorOrder, pagination: OffsetPaginationInput): ContractorTypeCountList!
   projects(filters: ProjectFilter, order: ProjectOrder, pagination: OffsetPaginationInput): ProjectTypeCountList!
   allProjects: [ProjectType!]!
-  allDeadlines: [DeadlineType!]!
+  allDeadlines(filters: DeadlineFilter = null): [DeadlineType!]!
   client(pk: ID!): ClientType
   contractor(pk: ID!): ContractorType
   project(pk: ID!): ProjectType
@@ -451,6 +471,11 @@ type PrivateQuery {
   allActiveTasks: [TaskType!]!
   myTimeEntries(date: Date!): [TimeEntryType!]!
   allTimeEntries(filters: TimeEntryFilter!): [TimeEntryType!]!
+
+  """
+  Return total minutes and target minutes per day for the user within the given date range.
+  """
+  dailySummary(dateGte: Date!, dateLte: Date!): [DailySummaryType!]!
   contract(pk: ID!): ContractType
   task(pk: ID!): TaskType
   journal(date: Date!): JournalType
@@ -486,6 +511,7 @@ type ProjectType implements UserResourceTypeMixin {
   projectClientId: ID!
   contractorId: ID!
   name: String!
+  shortName: String!
   description: String
   projectClient: ClientType!
   contractor: ContractorType!