Merge pull request #328 from lara-learning/feat/feedback-for-mentor

feat: feedback for mentor

Author: Julian-Wogersien

packages/api/schema.gql

@@ -143,7 +143,8 @@ input PaperInput {
   subject: String!
   status: PaperStatus!
   briefing: [PaperEntryInput!]!
-  feedback: [PaperEntryInput!]!
+  feedbackTrainee: [PaperEntryInput!]!
+  feedbackMentor: [PaperEntryInput!]!
 }
 
 input PaperUpdateInput {
@@ -159,7 +160,8 @@ input PaperUpdateInput {
   subject: String!
   status: PaperStatus!
   briefing: [PaperEntryInput!]!
-  feedback: [PaperEntryInput!]!
+  feedbackTrainee: [PaperEntryInput!]!
+  feedbackMentor: [PaperEntryInput!]!
 }
 
 input AnswerPaperInput {
@@ -735,7 +737,8 @@ type Paper {
   trainerId: ID!
   status: PaperStatus!
   briefing: [PaperFormData!]!
-  feedback: [PaperFormData!]!
+  feedbackTrainee: [PaperFormData!]!
+  feedbackMentor: [PaperFormData!]!
   conclusion: String
   archivedAt: String
   createdAt: String

packages/api/src/graphql.ts

@@ -548,7 +548,8 @@ export type GqlPaper = {
   client: Scalars['String']['output'];
   conclusion?: Maybe<Scalars['String']['output']>;
   createdAt?: Maybe<Scalars['String']['output']>;
-  feedback: Array<GqlPaperFormData>;
+  feedbackMentor: Array<GqlPaperFormData>;
+  feedbackTrainee: Array<GqlPaperFormData>;
   id: Scalars['ID']['output'];
   mentorId: Scalars['ID']['output'];
   periodEnd?: Maybe<Scalars['String']['output']>;
@@ -581,7 +582,8 @@ export type GqlPaperFormData = {
 export type GqlPaperInput = {
   briefing: Array<GqlPaperEntryInput>;
   client: Scalars['String']['input'];
-  feedback: Array<GqlPaperEntryInput>;
+  feedbackMentor: Array<GqlPaperEntryInput>;
+  feedbackTrainee: Array<GqlPaperEntryInput>;
   mentorId: Scalars['ID']['input'];
   periodEnd?: InputMaybe<Scalars['String']['input']>;
   periodStart?: InputMaybe<Scalars['String']['input']>;
@@ -604,7 +606,8 @@ export type GqlPaperStatus =
 export type GqlPaperUpdateInput = {
   briefing: Array<GqlPaperEntryInput>;
   client: Scalars['String']['input'];
-  feedback: Array<GqlPaperEntryInput>;
+  feedbackMentor: Array<GqlPaperEntryInput>;
+  feedbackTrainee: Array<GqlPaperEntryInput>;
   id: Scalars['ID']['input'];
   mentorId: Scalars['ID']['input'];
   periodEnd?: InputMaybe<Scalars['String']['input']>;
@@ -1211,7 +1214,8 @@ export type GqlPaperResolvers<ContextType = Context, ParentType extends GqlResol
   client?: Resolver<GqlResolversTypes['String'], ParentType, ContextType>;
   conclusion?: Resolver<Maybe<GqlResolversTypes['String']>, ParentType, ContextType>;
   createdAt?: Resolver<Maybe<GqlResolversTypes['String']>, ParentType, ContextType>;
-  feedback?: Resolver<Array<GqlResolversTypes['PaperFormData']>, ParentType, ContextType>;
+  feedbackMentor?: Resolver<Array<GqlResolversTypes['PaperFormData']>, ParentType, ContextType>;
+  feedbackTrainee?: Resolver<Array<GqlResolversTypes['PaperFormData']>, ParentType, ContextType>;
   id?: Resolver<GqlResolversTypes['ID'], ParentType, ContextType>;
   mentorId?: Resolver<GqlResolversTypes['ID'], ParentType, ContextType>;
   periodEnd?: Resolver<Maybe<GqlResolversTypes['String']>, ParentType, ContextType>;

packages/api/src/models.ts

@@ -70,9 +70,10 @@ export type Report = Omit<GqlReport, 'days' | 'comments' | 'nextReportLink' | 'p
   traineeId: string
 }
 
-export type Paper = Omit<GqlPaper, 'briefing' | 'feedback'> & {
+export type Paper = Omit<GqlPaper, 'briefing' | 'feedbackTrainee' | 'feedbackMentor'> & {
   briefing: GqlPaperFormData[]
-  feedback: GqlPaperFormData[]
+  feedbackTrainee: GqlPaperFormData[]
+  feedbackMentor: GqlPaperFormData[]
 }
 
 export type PaperFormData = Omit<GqlPaperFormData, 'answer' | 'question' | 'questionId' | 'hint' | 'id'> & {

packages/backend/seeds/papers.json

@@ -12,7 +12,8 @@
     "subject": "Android Entwicklung",
     "status": "NotStarted",
     "briefing": [],
-    "feedback": []
+    "feedbackTrainee": [],
+    "feedbackMentor": []
   },
   {
     "id": "2",
@@ -27,6 +28,7 @@
     "subject": "IOS Entwicklung",
     "status": "NotStarted",
     "briefing": [],
-    "feedback": []
+    "feedbackTrainee": [],
+    "feedbackMentor": []
   }
 ]

packages/backend/src/permissions.ts

@@ -26,6 +26,10 @@ export const isMentor = (user: User): user is Mentor => {
   return user.type === 'Mentor'
 }
 
+const mentor = rule({ cache: 'contextual' })(
+  (_parent, _args, ctx: AuthenticatedContext) => isMentor(ctx.currentUser) || 'Wrong Usertype'
+)
+
 export const isAdmin = (user: User): user is Admin => {
   return user.type === 'Admin'
 }
@@ -95,9 +99,11 @@ export const permissions = shield<unknown, Context>(
       claimTrainee: and(authenticated, trainer),
       unclaimTrainee: and(authenticated, trainer),
       createPaper: and(authenticated, or(trainee, trainer)),
-      updatePaper: and(authenticated, or(trainee, trainer)),
       deletePaper: and(authenticated, or(trainee, trainer)),
 
+      // Trainer and Trainee and Mentor mutations
+      updatePaper: and(authenticated, or(trainee, trainer, mentor)),
+
       //Admin mutations
       createTrainee: and(authenticated, admin),
       updateTrainee: and(authenticated, admin),

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

@@ -10,7 +10,10 @@ export const paperResolver: GqlResolvers<AuthenticatedContext> = {
     },
     updatePaper: async (_parent, { input }) => {
       const briefing = input.briefing.map((entry: GqlPaperEntryInput) => generatePaperEntry(entry))
-      return await updatePaper({ ...input, briefing }, { updateKeys: ['briefing', 'feedback', 'status'] })
+      return await updatePaper(
+        { ...input, briefing },
+        { updateKeys: ['briefing', 'feedbackTrainee', 'feedbackMentor', 'status'] }
+      )
     },
     deletePaper: async (_parent, { paperId }, { currentUser }) => {
       const papers = await papersByTrainer(currentUser.id)

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

@@ -13,5 +13,7 @@ export const generatePaper = (paperInput: GqlPaperInput): GqlPaper => {
     createdAt: new Date().toISOString(),
     ...paperInput,
     briefing: paperInput.briefing.map((entry) => generatePaperEntry(entry)),
+    feedbackTrainee: paperInput.feedbackTrainee.map((entry) => generatePaperEntry(entry)),
+    feedbackMentor: paperInput.feedbackMentor.map((entry) => generatePaperEntry(entry)),
   }
 }

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

@@ -136,7 +136,7 @@ const transformPaper = (paper: Paper): PrintPaper => {
   return {
     status: paper.status,
     briefing: transformPaperForm(paper.briefing),
-    feedback: transformPaperForm(paper.feedback),
+    feedback: transformPaperForm(paper.feedbackTrainee),
     client: paper.client,
     periodStart: paper.periodStart ?? '',
     periodEnd: paper.periodEnd ?? '',

packages/backend/src/test/paper.service.test.ts

@@ -47,7 +47,8 @@ describe('createPaperData', () => {
           hint: 'TestHint',
         },
       ],
-      feedback: [],
+      feedbackTrainee: [],
+      feedbackMentor: [],
     }
 
     paper = generatePaper(paperInput)