fix: Add duration to getTask, addTask, quickAddTask and UpdateTask (#242

)

package.json

@@ -52,6 +52,7 @@
         "rimraf": "3.0.2",
         "ts-jest": "29.0.5",
         "ts-node": "10.9.1",
+        "type-fest": "^4.5.0",
         "typescript": "4.9.5"
     },
     "prettier": "@doist/prettier-config",

src/testUtils/testDefaults.ts

@@ -7,6 +7,7 @@ import {
     User,
     Comment,
     Attachment,
+    Duration,
 } from '../types'
 
 const DEFAULT_TASK_ID = '1234'
@@ -44,6 +45,11 @@ export const DEFAULT_DUE_DATE = {
     date: DEFAULT_DATE,
 }
 
+export const DEFAULT_DURATION: Duration = {
+    amount: 10,
+    unit: 'minute',
+}
+
 export const INVALID_DUE_DATE = {
     ...DEFAULT_DUE_DATE,
     isRecurring: 'false',
@@ -63,6 +69,7 @@ export const DEFAULT_QUICK_ADD_RESPONSE: QuickAddTaskResponse = {
     checked: false,
     addedAt: DEFAULT_DATE,
     addedByUid: DEFAULT_CREATOR,
+    duration: DEFAULT_DURATION,
     due: {
         date: DEFAULT_DATE,
         timezone: null,
@@ -89,6 +96,7 @@ export const DEFAULT_TASK: Task = {
     due: DEFAULT_DUE_DATE,
     assigneeId: DEFAULT_ASSIGNEE,
     creatorId: DEFAULT_CREATOR,
+    duration: DEFAULT_DURATION,
 }
 
 export const INVALID_TASK = {
@@ -103,6 +111,7 @@ export const TASK_WITH_OPTIONALS_AS_NULL: Task = {
     assignerId: null,
     parentId: null,
     sectionId: null,
+    duration: null,
 }
 
 export const DEFAULT_PROJECT: Project = {

src/types/entities.ts

@@ -40,6 +40,13 @@ export const DueDate = Record({
 
 export type DueDate = Static<typeof DueDate>
 
+export const Duration = Record({
+    amount: NumberRunType.withConstraint((n) => n > 0 || 'Value should be greater than zero'),
+    unit: Union(Literal('minute'), Literal('day')),
+})
+
+export type Duration = Static<typeof Duration>
+
 export const Task = Record({
     id: String,
     order: Int,
@@ -53,6 +60,7 @@ export const Task = Record({
     createdAt: String,
     url: String,
     creatorId: String,
+    duration: Duration.Or(Null),
 }).And(
     Partial({
         due: DueDate.Or(Null),
@@ -187,6 +195,7 @@ export type QuickAddTaskResponse = {
     checked: boolean // completed
     addedAt: string // created
     addedByUid: string | null
+    duration: Duration | null
     due: {
         date: string
         timezone: string | null

src/types/requests.ts

@@ -1,3 +1,6 @@
+import type { RequireAllOrNone } from 'type-fest'
+import type { Duration } from './entities'
+
 export type AddTaskArgs = {
     content: string
     description?: string
@@ -12,7 +15,10 @@ export type AddTaskArgs = {
     dueDate?: string
     dueDatetime?: string
     assigneeId?: string
-}
+} & RequireAllOrNone<{
+    duration?: Duration['amount']
+    durationUnit?: Duration['unit']
+}>
 
 export type QuickAddTaskArgs = {
     text: string
@@ -40,7 +46,10 @@ export type UpdateTaskArgs = {
     dueDate?: string | null
     dueDatetime?: string | null
     assigneeId?: string | null
-}
+} & RequireAllOrNone<{
+    duration?: Duration['amount']
+    durationUnit?: Duration['unit']
+}>
 
 export type ProjectViewStyle = 'list' | 'board'
 

src/utils/taskConverters.ts

@@ -36,6 +36,7 @@ export function getTaskFromQuickAddResponse(responseData: QuickAddTaskResponse):
         ...(responseData.responsibleUid !== null && {
             assigneeId: responseData.responsibleUid,
         }),
+        duration: responseData.duration,
     }
 
     return task