Merge pull request #339 from lara-learning/feat/split-days

feat: split days

Author: Julian-Wogersien

packages/alexa/src/helpers/report.ts

@@ -1,9 +1,10 @@
 import { Report, Day, Entry } from '@lara/api'
 import { getLaraConfig } from '../graphql/config'
 
-type ReducedDay = Pick<Day, 'id' | 'status'> & { entries: Pick<Entry, 'time'>[] }
+type ReducedDay = Pick<Day, 'id' | 'status'> & { entries: Pick<Entry, 'time' | 'time_split'>[] }
 
-const totalDayMinutes = (day: ReducedDay) => day.entries.reduce((acc, entry) => acc + entry.time, 0)
+const totalDayMinutes = (day: ReducedDay) =>
+  day.entries.reduce((acc, entry) => acc + (entry.time ? entry.time : entry.time_split!), 0)
 
 export const finishedDays = async (days: ReducedDay[]): Promise<number> => {
   const config = await getLaraConfig()

packages/api/schema.gql

@@ -46,6 +46,7 @@ type Day implements CommentableInterface {
   entries: [Entry!]!
   id: ID!
   status: DayStatusEnum
+  status_split: DayStatusEnum
 }
 
 enum DayStatusEnum {
@@ -87,13 +88,17 @@ type Entry implements CommentableInterface {
   createdAt: String!
   id: ID!
   orderId: Int!
-  text: String!
-  time: Int!
+  text: String
+  time: Int
+  text_split: String
+  time_split: Int
 }
 
 input EntryInput {
-  text: String!
-  time: Int!
+  text: String
+  time: Int
+  text_split: String
+  time_split: Int
 }
 
 type OAuthPayload {
@@ -212,7 +217,7 @@ type Mutation {
   """
   Updates day which is identified by the id argument.
   """
-  updateDay(status: String, id: ID!): Day
+  updateDay(status: String, status_split: String, id: ID!): Day
   updateEntry(id: ID!, input: EntryInput!): MutateEntryPayload!
   updateEntryOrder(entryId: ID!, dayId: ID!, orderId: Int!): MutateEntryPayload!
 

packages/api/src/graphql.ts

@@ -93,6 +93,7 @@ export type GqlDay = GqlCommentableInterface & {
   entries: Array<GqlEntry>;
   id: Scalars['ID']['output'];
   status?: Maybe<GqlDayStatusEnum>;
+  status_split?: Maybe<GqlDayStatusEnum>;
 };
 
 export type GqlDayStatusEnum =
@@ -125,13 +126,17 @@ export type GqlEntry = GqlCommentableInterface & {
   createdAt: Scalars['String']['output'];
   id: Scalars['ID']['output'];
   orderId: Scalars['Int']['output'];
-  text: Scalars['String']['output'];
-  time: Scalars['Int']['output'];
+  text?: Maybe<Scalars['String']['output']>;
+  text_split?: Maybe<Scalars['String']['output']>;
+  time?: Maybe<Scalars['Int']['output']>;
+  time_split?: Maybe<Scalars['Int']['output']>;
 };
 
 export type GqlEntryInput = {
-  text: Scalars['String']['input'];
-  time: Scalars['Int']['input'];
+  text?: InputMaybe<Scalars['String']['input']>;
+  text_split?: InputMaybe<Scalars['String']['input']>;
+  time?: InputMaybe<Scalars['Int']['input']>;
+  time_split?: InputMaybe<Scalars['Int']['input']>;
 };
 
 export type GqlLaraConfig = {
@@ -389,6 +394,7 @@ export type GqlMutationUpdateCurrentUserArgs = {
 export type GqlMutationUpdateDayArgs = {
   id: Scalars['ID']['input'];
   status?: InputMaybe<Scalars['String']['input']>;
+  status_split?: InputMaybe<Scalars['String']['input']>;
 };
 
 
@@ -854,6 +860,7 @@ export type GqlDayResolvers<ContextType = Context, ParentType extends GqlResolve
   entries?: Resolver<Array<GqlResolversTypes['Entry']>, ParentType, ContextType>;
   id?: Resolver<GqlResolversTypes['ID'], ParentType, ContextType>;
   status?: Resolver<Maybe<GqlResolversTypes['DayStatusEnum']>, ParentType, ContextType>;
+  status_split?: Resolver<Maybe<GqlResolversTypes['DayStatusEnum']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 
@@ -873,8 +880,10 @@ export type GqlEntryResolvers<ContextType = Context, ParentType extends GqlResol
   createdAt?: Resolver<GqlResolversTypes['String'], ParentType, ContextType>;
   id?: Resolver<GqlResolversTypes['ID'], ParentType, ContextType>;
   orderId?: Resolver<GqlResolversTypes['Int'], ParentType, ContextType>;
-  text?: Resolver<GqlResolversTypes['String'], ParentType, ContextType>;
-  time?: Resolver<GqlResolversTypes['Int'], ParentType, ContextType>;
+  text?: Resolver<Maybe<GqlResolversTypes['String']>, ParentType, ContextType>;
+  text_split?: Resolver<Maybe<GqlResolversTypes['String']>, ParentType, ContextType>;
+  time?: Resolver<Maybe<GqlResolversTypes['Int']>, ParentType, ContextType>;
+  time_split?: Resolver<Maybe<GqlResolversTypes['Int']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 

packages/backend/src/resolvers/day.resolver.ts

@@ -15,7 +15,7 @@ export const dayResolver: GqlResolvers<AuthenticatedContext> = {
 
 export const dayTraineeResolver: GqlResolvers<TraineeContext> = {
   Mutation: {
-    updateDay: async (_parent, { id, status }, { currentUser }) => {
+    updateDay: async (_parent, { id, status, status_split }, { currentUser }) => {
       const reports = await reportsWithinApprenticeship(currentUser)
 
       const { report, day } = reportDayByDayId(id, reports)
@@ -37,15 +37,13 @@ export const dayTraineeResolver: GqlResolvers<TraineeContext> = {
         throw new GraphQLError(t('errors.wrongDayStatus'))
       }
 
-      if (!status || !isDayStatus(status) || status === 'holiday') {
-        throw new GraphQLError(t('errors.wrongDayStatus'))
-      }
+      if (status && isDayStatus(status)) day.status = status
 
       if (status === 'vacation' || status === 'sick') {
         day.entries = []
       }
 
-      day.status = status
+      if (status_split && isDayStatus(status_split)) day.status_split = status_split
 
       await updateReport(report, { updateKeys: ['days'] })
 

packages/backend/src/resolvers/entry.resolver.ts

@@ -18,7 +18,9 @@ export const entryTraineeResolver: GqlResolvers<TraineeContext> = {
         report.days.forEach((day) => {
           day.entries.forEach((entry) => {
             const text = entry.text
-            tmp[text] = tmp[text] ? tmp[text] + 1 : 1
+            tmp[text ? text : entry.text_split!] = tmp[text ? text : entry.text_split!]
+              ? tmp[text ? text : entry.text_split!] + 1
+              : 1
           })
         })
       })
@@ -99,6 +101,8 @@ export const entryTraineeResolver: GqlResolvers<TraineeContext> = {
 
       entry.text = input.text
       entry.time = input.time
+      entry.text_split = input.text_split
+      entry.time_split = input.time_split
 
       await updateReport(report, { updateKeys: ['days'] })
 

packages/backend/src/resolvers/trainee.resolver.ts

@@ -65,13 +65,17 @@ export const traineeTraineeResolver: GqlResolvers<TraineeContext> = {
       reports.forEach((report) => {
         report.days.forEach((day) => {
           day.entries.forEach((entry) => {
-            const { text, time } = entry
-
-            if (!textCountsWithTime[text]) {
-              textCountsWithTime[text] = { count: 0, duration: time, text: text }
+            const { text, time, text_split, time_split } = entry
+
+            if (!textCountsWithTime[text ? text : text_split!]) {
+              textCountsWithTime[text ? text : text_split!] = {
+                count: 0,
+                duration: time ? time : time_split!,
+                text: text ? text : text_split!,
+              }
             }
-            textCountsWithTime[text].count += 1
-            textCountsWithTime[text].duration = time
+            textCountsWithTime[text ? text : text_split!].count += 1
+            textCountsWithTime[text ? text : text_split!].duration = time ? time : time_split!
           })
         })
       })

packages/backend/src/services/day.service.ts

@@ -98,7 +98,7 @@ export const dayMinutes = (day: Day): number => {
   const status = dayStatus(day)
 
   if (status === 'education' || status === 'work') {
-    return day.entries.reduce((accumulator, entry) => accumulator + entry.time, 0)
+    return day.entries.reduce((accumulator, entry) => accumulator + (entry.time ? entry.time : entry.time_split!), 0)
   } else {
     return 0
   }

packages/backend/src/services/entry.service.ts

@@ -80,11 +80,17 @@ export const validateEntryUpdate = (report: Report, day: Day, newEntry: Entry, l
     entries: day.entries.filter((d) => d.id !== newEntry.id),
   })
 
-  if (day.status === 'work' && minutes + newEntry.time > LaraConfig.maxWorkDayMinutes) {
+  if (
+    day.status === 'work' &&
+    minutes + (newEntry.time ? newEntry.time : newEntry.time_split!) > LaraConfig.maxWorkDayMinutes
+  ) {
     throw new GraphQLError(t('errors.dayTimeLimit'))
   }
 
-  if (day.status === 'education' && minutes + newEntry.time > LaraConfig.maxEducationDayMinutes) {
+  if (
+    day.status === 'education' &&
+    minutes + (newEntry.time ? newEntry.time : newEntry.time_split!) > LaraConfig.maxEducationDayMinutes
+  ) {
     throw new GraphQLError(t('errors.dayTimeLimit'))
   }
 

packages/backend/src/services/print.service.ts

@@ -60,8 +60,8 @@ export const createPrintUserData = async (trainee: Trainee): Promise<PrintUserDa
  * @returns Entry for print
  */
 const transformEntry = (entry: Entry): PrintEntry => ({
-  text: entry.text,
-  time: entry.time,
+  text: entry.text ? entry.text : entry.text_split!,
+  time: entry.time ? entry.time : entry.time_split!,
   orderId: entry.orderId,
 })
 

packages/components/src/entry-input-layout.tsx

@@ -199,7 +199,6 @@ export const EntryInputLayout: React.FC<EntryInputLayoutProps> = ({
   clickHandler,
   ...rest
 }) => {
-  console.log(term)
   return (
     <>
       <StyledEntryContainer {...rest}>