Merge branch '2131-crud-for-messages' into 2132-Messages-in-Wallet

backend/src/graphql/model/Contribution.ts

@@ -1,7 +1,8 @@
 import { ObjectType, Field, Int } from 'type-graphql'
 import Decimal from 'decimal.js-light'
 import { Contribution as dbContribution } from '@entity/Contribution'
-import { User } from './User'
+import { User } from '@entity/User'
+import { ContributionMessage } from './ContributionMessage'
 
 @ObjectType()
 export class Contribution {
@@ -16,6 +17,10 @@ export class Contribution {
     this.confirmedAt = contribution.confirmedAt
     this.confirmedBy = contribution.confirmedBy
     this.contributionDate = contribution.contributionDate
+    this.state = contribution.contributionStatus
+    this.messages = contribution.messages
+      ? contribution.messages.map((message) => new ContributionMessage(message, user))
+      : []
   }
 
   @Field(() => Number)
@@ -47,6 +52,12 @@ export class Contribution {
 
   @Field(() => Date)
   contributionDate: Date
+
+  @Field(() => [ContributionMessage])
+  messages: ContributionMessage[]
+
+  @Field(() => String)
+  state: string
 }
 
 @ObjectType()

backend/src/graphql/model/ContributionMessage.ts

@@ -1,6 +1,6 @@
 import { Field, ObjectType } from 'type-graphql'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
-import { User } from './User'
+import { User } from '@entity/User'
 
 @ObjectType()
 export class ContributionMessage {

backend/src/graphql/resolver/AdminResolver.ts

@@ -740,6 +740,6 @@ export class AdminResolver {
     } finally {
       await queryRunner.release()
     }
-    return new ContributionMessage(contributionMessage, new User(user))
+    return new ContributionMessage(contributionMessage, user)
   }
 }

backend/src/graphql/resolver/ContributionMessageResolver.ts

@@ -9,7 +9,6 @@ import { ContributionMessageType } from '@enum/MessageType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { getConnection } from '@dbTools/typeorm'
 import { ContributionMessage } from '@model/ContributionMessage'
-import { User } from '@model/User'
 
 @Resolver()
 export class ContributionMessageResolver {
@@ -52,6 +51,6 @@ export class ContributionMessageResolver {
     } finally {
       await queryRunner.release()
     }
-    return new ContributionMessage(contributionMessage, new User(user))
+    return new ContributionMessage(contributionMessage, user)
   }
 }

backend/src/graphql/resolver/ContributionResolver.ts

@@ -96,13 +96,14 @@ export class ContributionResolver {
       order: {
         createdAt: order,
       },
+      relations: ['messages'],
       withDeleted: true,
       skip: (currentPage - 1) * pageSize,
       take: pageSize,
     })
     return new ContributionListResult(
       count,
-      contributions.map((contribution) => new Contribution(contribution, new User(user))),
+      contributions.map((contribution) => new Contribution(contribution, user)),
     )
   }
 
@@ -123,9 +124,7 @@ export class ContributionResolver {
       .getManyAndCount()
     return new ContributionListResult(
       count,
-      dbContributions.map(
+      dbContributions.map((contribution) => new Contribution(contribution, contribution.user)),
-        (contribution) => new Contribution(contribution, new User(contribution.user)),
-      ),
     )
   }
 

frontend/src/graphql/queries.js

@@ -206,6 +206,16 @@ export const listContributions = gql`
         confirmedAt
         confirmedBy
         deletedAt
+        state
+        messages {
+          id
+          message
+          createdAt
+          updatedAt
+          type
+          userFirstName
+          userLastName
+        }
       }
     }
   }