Merge branch 'master' into fix-locales-nederlands

admin/src/components/Tables/OpenCreationsTable.vue

@@ -12,33 +12,42 @@
         </b-button>
       </template>
       <template #cell(editCreation)="row">
-        <b-button
-          v-if="row.item.moderator"
-          variant="info"
-          size="md"
-          @click="rowToggleDetails(row, 0)"
-          class="mr-2"
-        >
-          <b-icon :icon="row.detailsShowing ? 'x' : 'pencil-square'" aria-label="Help"></b-icon>
-        </b-button>
-        <b-button v-else @click="rowToggleDetails(row, 0)">
-          <b-icon icon="chat-dots"></b-icon>
-          <b-icon
-            v-if="row.item.state === 'PENDING' && row.item.messageCount > 0"
-            icon="exclamation-circle-fill"
-            variant="warning"
-          ></b-icon>
-          <b-icon
-            v-if="row.item.state === 'IN_PROGRESS' && row.item.messageCount > 0"
-            icon="question-diamond"
-            variant="light"
-          ></b-icon>
-        </b-button>
+        <div v-if="$store.state.moderator.id !== row.item.userId">
+          <b-button
+            v-if="row.item.moderator"
+            variant="info"
+            size="md"
+            @click="rowToggleDetails(row, 0)"
+            class="mr-2"
+          >
+            <b-icon :icon="row.detailsShowing ? 'x' : 'pencil-square'" aria-label="Help"></b-icon>
+          </b-button>
+          <b-button v-else @click="rowToggleDetails(row, 0)">
+            <b-icon icon="chat-dots"></b-icon>
+            <b-icon
+              v-if="row.item.state === 'PENDING' && row.item.messageCount > 0"
+              icon="exclamation-circle-fill"
+              variant="warning"
+            ></b-icon>
+            <b-icon
+              v-if="row.item.state === 'IN_PROGRESS' && row.item.messageCount > 0"
+              icon="question-diamond"
+              variant="light"
+            ></b-icon>
+          </b-button>
+        </div>
       </template>
       <template #cell(confirm)="row">
-        <b-button variant="success" size="md" @click="$emit('show-overlay', row.item)" class="mr-2">
-          <b-icon icon="check" scale="2" variant=""></b-icon>
-        </b-button>
+        <div v-if="$store.state.moderator.id !== row.item.userId">
+          <b-button
+            variant="success"
+            size="md"
+            @click="$emit('show-overlay', row.item)"
+            class="mr-2"
+          >
+            <b-icon icon="check" scale="2" variant=""></b-icon>
+          </b-button>
+        </div>
       </template>
       <template #row-details="row">
         <row-details

admin/src/graphql/listUnconfirmedContributions.js

@@ -6,6 +6,7 @@ export const listUnconfirmedContributions = gql`
       id
       firstName
       lastName
+      userId
       email
       amount
       memo

admin/src/pages/CreationConfirm.spec.js

@@ -14,21 +14,23 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
         id: 1,
         firstName: 'Bibi',
         lastName: 'Bloxberg',
+        userId: 99,
         email: 'bibi@bloxberg.de',
         amount: 500,
         memo: 'Danke für alles',
         date: new Date(),
-        moderator: 2,
+        moderator: 1,
       },
       {
         id: 2,
         firstName: 'Räuber',
         lastName: 'Hotzenplotz',
+        userId: 100,
         email: 'raeuber@hotzenplotz.de',
         amount: 1000000,
         memo: 'Gut Ergattert',
         date: new Date(),
-        moderator: 2,
+        moderator: 1,
       },
     ],
   },
@@ -41,6 +43,15 @@ const mocks = {
   $d: jest.fn((d) => d),
   $store: {
     commit: storeCommitMock,
+    state: {
+      moderator: {
+        firstName: 'Peter',
+        lastName: 'Lustig',
+        isAdmin: '2022-08-30T07:41:31.000Z',
+        id: 263,
+        language: 'de',
+      },
+    },
   },
   $apollo: {
     query: apolloQueryMock,

backend/src/graphql/resolver/AdminResolver.ts

@@ -717,6 +717,9 @@ export class AdminResolver {
       if (!contribution) {
         throw new Error('Contribution not found')
       }
+      if (contribution.userId === user.id) {
+        throw new Error('Admin can not answer on own contribution')
+      }
       contributionMessage.contributionId = contributionId
       contributionMessage.createdAt = new Date()
       contributionMessage.message = message

backend/src/graphql/resolver/ContributionMessageResolver.test.ts

@@ -93,6 +93,38 @@ describe('ContributionMessageResolver', () => {
             }),
           )
         })
+
+        it('throws error when contribution.userId equals user.id', async () => {
+          await query({
+            query: login,
+            variables: { email: 'peter@lustig.de', password: 'Aa12345_' },
+          })
+          const result2 = await mutate({
+            mutation: createContribution,
+            variables: {
+              amount: 100.0,
+              memo: 'Test env contribution',
+              creationDate: new Date().toString(),
+            },
+          })
+          await expect(
+            mutate({
+              mutation: adminCreateContributionMessage,
+              variables: {
+                contributionId: result2.data.createContribution.id,
+                message: 'Test',
+              },
+            }),
+          ).resolves.toEqual(
+            expect.objectContaining({
+              errors: [
+                new GraphQLError(
+                  'ContributionMessage was not successful: Error: Admin can not answer on own contribution',
+                ),
+              ],
+            }),
+          )
+        })
       })
 
       describe('valid input', () => {

backend/src/graphql/resolver/StatisticsResolver.ts

@@ -7,49 +7,48 @@ import { getConnection } from '@dbTools/typeorm'
 import Decimal from 'decimal.js-light'
 import { calculateDecay } from '@/util/decay'
 
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+
 @Resolver()
 export class StatisticsResolver {
   @Authorized([RIGHTS.COMMUNITY_STATISTICS])
   @Query(() => CommunityStatistics)
   async communityStatistics(): Promise<CommunityStatistics> {
-    const allUsers = await DbUser.find({ withDeleted: true })
-
-    let totalUsers = 0
-    let activeUsers = 0
-    let deletedUsers = 0
+    const allUsers = await DbUser.count({ withDeleted: true })
+    const totalUsers = await DbUser.count()
+    const deletedUsers = allUsers - totalUsers
 
     let totalGradidoAvailable: Decimal = new Decimal(0)
     let totalGradidoUnbookedDecayed: Decimal = new Decimal(0)
 
     const receivedCallDate = new Date()
 
-    for (let i = 0; i < allUsers.length; i++) {
-      if (allUsers[i].deletedAt) {
-        deletedUsers++
-      } else {
-        totalUsers++
-        const lastTransaction = await DbTransaction.findOne({
-          where: { userId: allUsers[i].id },
-          order: { balanceDate: 'DESC' },
-        })
-        if (lastTransaction) {
-          activeUsers++
-          const decay = calculateDecay(
-            lastTransaction.balance,
-            lastTransaction.balanceDate,
-            receivedCallDate,
-          )
-          if (decay) {
-            totalGradidoAvailable = totalGradidoAvailable.plus(decay.balance.toString())
-            totalGradidoUnbookedDecayed = totalGradidoUnbookedDecayed.plus(decay.decay.toString())
-          }
-        }
-      }
-    }
-
     const queryRunner = getConnection().createQueryRunner()
     await queryRunner.connect()
 
+    const lastUserTransactions = await queryRunner.manager
+      .createQueryBuilder(DbUser, 'user')
+      .select('transaction.balance', 'balance')
+      .addSelect('transaction.balance_date', 'balanceDate')
+      .innerJoin(DbTransaction, 'transaction', 'user.id = transaction.user_id')
+      .where(
+        `transaction.balance_date = (SELECT MAX(t.balance_date) FROM transactions AS t WHERE t.user_id = user.id)`,
+      )
+      .orderBy('transaction.balance_date', 'DESC')
+      .addOrderBy('transaction.id', 'DESC')
+      .getRawMany()
+
+    const activeUsers = lastUserTransactions.length
+
+    lastUserTransactions.forEach(({ balance, balanceDate }) => {
+      const decay = calculateDecay(new Decimal(balance), new Date(balanceDate), receivedCallDate)
+      if (decay) {
+        totalGradidoAvailable = totalGradidoAvailable.plus(decay.balance.toString())
+        totalGradidoUnbookedDecayed = totalGradidoUnbookedDecayed.plus(decay.decay.toString())
+      }
+    })
+
     const { totalGradidoCreated } = await queryRunner.manager
       .createQueryBuilder()
       .select('SUM(transaction.amount) AS totalGradidoCreated')