Merge branch 'master' into 2818-pagination-is-not-reset-when-switching-tabs

admin/src/components/ChangeUserRoleFormular.spec.js

@@ -28,6 +28,7 @@ const mocks = {
 
 let propsData
 let wrapper
+let spy
 
 describe('ChangeUserRoleFormular', () => {
   const Wrapper = () => {
@@ -70,12 +71,16 @@ describe('ChangeUserRoleFormular', () => {
         expect(wrapper.text()).toContain('userRole.notChangeYourSelf')
       })
 
-      it('has role select disabled', () => {
+      it('has no role select', () => {
-        expect(wrapper.find('select[disabled="disabled"]').exists()).toBe(true)
+        expect(wrapper.find('select.role-select').exists()).toBe(false)
+      })
+
+      it('has no button', () => {
+        expect(wrapper.find('button.btn.btn-dange').exists()).toBe(false)
       })
     })
 
-    describe('change others role', () => {
+    describe("change other user's role", () => {
       let rolesToSelect
 
       describe('general', () => {
@@ -106,19 +111,12 @@ describe('ChangeUserRoleFormular', () => {
           expect(wrapper.find('select.role-select[disabled="disabled"]').exists()).toBe(false)
         })
 
-        describe('on API error', () => {
+        it('has "change_user_role" button', () => {
-          beforeEach(() => {
+          expect(wrapper.find('button.btn.btn-danger').text()).toBe('change_user_role')
-            apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
-            rolesToSelect.at(1).setSelected()
-          })
-
-          it('toasts an error message', () => {
-            expect(toastErrorSpy).toBeCalledWith('Oh no!')
-          })
         })
       })
 
-      describe('user is usual user', () => {
+      describe('user has role "usual user"', () => {
         beforeEach(() => {
           apolloMutateMock.mockResolvedValue({
             data: {
@@ -141,6 +139,10 @@ describe('ChangeUserRoleFormular', () => {
 
         describe('change select to', () => {
           describe('same role', () => {
+            it('has "change_user_role" button disabled', () => {
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(true)
+            })
+
             it('does not call the API', () => {
               rolesToSelect.at(0).setSelected()
               expect(apolloMutateMock).not.toHaveBeenCalled()
@@ -152,6 +154,27 @@ describe('ChangeUserRoleFormular', () => {
               rolesToSelect.at(1).setSelected()
             })
 
+            it('has "change_user_role" button enabled', () => {
+              expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
+                false,
+              )
+            })
+
+            describe('clicking the "change_user_role" button', () => {
+              beforeEach(async () => {
+                spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                spy.mockImplementation(() => Promise.resolve(true))
+                await wrapper.find('button').trigger('click')
+                await wrapper.vm.$nextTick()
+              })
+
+              it('calls the modal', () => {
+                expect(wrapper.emitted('showModal'))
+                expect(spy).toHaveBeenCalled()
+              })
+
+              describe('confirm role change with success', () => {
                 it('calls the API', () => {
                   expect(apolloMutateMock).toBeCalledWith(
                     expect.objectContaining({
@@ -181,10 +204,25 @@ describe('ChangeUserRoleFormular', () => {
                   expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
                 })
               })
+
+              describe('confirm role change with error', () => {
+                beforeEach(async () => {
+                  spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                  apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+                  await wrapper.find('button').trigger('click')
+                  await wrapper.vm.$nextTick()
+                })
+
+                it('toasts an error message', () => {
+                  expect(toastErrorSpy).toBeCalledWith('Oh no!')
+                })
+              })
+            })
+          })
         })
       })
 
-      describe('user is admin', () => {
+      describe('user has role "admin"', () => {
         beforeEach(() => {
           apolloMutateMock.mockResolvedValue({
             data: {
@@ -207,6 +245,10 @@ describe('ChangeUserRoleFormular', () => {
 
         describe('change select to', () => {
           describe('same role', () => {
+            it('has "change_user_role" button disabled', () => {
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(true)
+            })
+
             it('does not call the API', () => {
               rolesToSelect.at(1).setSelected()
               expect(apolloMutateMock).not.toHaveBeenCalled()
@@ -218,6 +260,27 @@ describe('ChangeUserRoleFormular', () => {
               rolesToSelect.at(0).setSelected()
             })
 
+            it('has "change_user_role" button enabled', () => {
+              expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
+                false,
+              )
+            })
+
+            describe('clicking the "change_user_role" button', () => {
+              beforeEach(async () => {
+                spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                spy.mockImplementation(() => Promise.resolve(true))
+                await wrapper.find('button').trigger('click')
+                await wrapper.vm.$nextTick()
+              })
+
+              it('calls the modal', () => {
+                expect(wrapper.emitted('showModal'))
+                expect(spy).toHaveBeenCalled()
+              })
+
+              describe('confirm role change with success', () => {
                 it('calls the API', () => {
                   expect(apolloMutateMock).toBeCalledWith(
                     expect.objectContaining({
@@ -247,6 +310,21 @@ describe('ChangeUserRoleFormular', () => {
                   expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
                 })
               })
+
+              describe('confirm role change with error', () => {
+                beforeEach(async () => {
+                  spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+                  apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+                  await wrapper.find('button').trigger('click')
+                  await wrapper.vm.$nextTick()
+                })
+
+                it('toasts an error message', () => {
+                  expect(toastErrorSpy).toBeCalledWith('Oh no!')
+                })
+              })
+            })
+          })
         })
       })
     })

admin/src/components/ChangeUserRoleFormular.vue

@@ -4,19 +4,23 @@
       <div v-if="item.userId === $store.state.moderator.id" class="m-3 mb-4">
         {{ $t('userRole.notChangeYourSelf') }}
       </div>
-      <div class="m-3">
+      <div v-else class="m-3">
         <label for="role" class="mr-3">{{ $t('userRole.selectLabel') }}</label>
-        <b-form-select
+        <b-form-select class="role-select" v-model="roleSelected" :options="roles" />
-          class="role-select"
+        <div class="mt-3 mb-5">
-          v-model="roleSelected"
+          <b-button
-          :options="roles"
+            variant="danger"
-          :disabled="item.userId === $store.state.moderator.id"
+            v-b-modal.user-role-modal
-        />
+            :disabled="currentRole === roleSelected"
+            @click="showModal()"
+          >
+            {{ $t('change_user_role') }}
+          </b-button>
+        </div>
       </div>
     </div>
   </div>
 </template>
-
 <script>
 import { setUserRole } from '../graphql/setUserRole'
 
@@ -35,6 +39,7 @@ export default {
   },
   data() {
     return {
+      currentRole: this.item.isAdmin ? rolesValues.admin : rolesValues.user,
       roleSelected: this.item.isAdmin ? rolesValues.admin : rolesValues.user,
       roles: [
         { value: rolesValues.user, text: this.$t('userRole.selectRoles.user') },
@@ -42,14 +47,35 @@ export default {
       ],
     }
   },
-  watch: {
-    roleSelected(newRole, oldRole) {
-      if (newRole !== oldRole) {
-        this.setUserRole(newRole, oldRole)
-      }
-    },
-  },
   methods: {
+    showModal() {
+      this.$bvModal
+        .msgBoxConfirm(
+          this.$t('overlay.changeUserRole.question', {
+            username: `${this.item.firstName} ${this.item.lastName}`,
+            newRole:
+              this.roleSelected === 'admin'
+                ? this.$t('userRole.selectRoles.admin')
+                : this.$t('userRole.selectRoles.user'),
+          }),
+          {
+            cancelTitle: this.$t('overlay.cancel'),
+            centered: true,
+            hideHeaderClose: true,
+            title: this.$t('overlay.changeUserRole.title'),
+            okTitle: this.$t('overlay.changeUserRole.yes'),
+            okVariant: 'danger',
+          },
+        )
+        .then((okClicked) => {
+          if (okClicked) {
+            this.setUserRole(this.roleSelected, this.currentRole)
+          }
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
+    },
     setUserRole(newRole, oldRole) {
       this.$apollo
         .mutate({

admin/src/components/CreationFormular.spec.js

@@ -2,14 +2,18 @@ import { mount } from '@vue/test-utils'
 import CreationFormular from './CreationFormular'
 import { adminCreateContribution } from '../graphql/adminCreateContribution'
 import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
+import VueApollo from 'vue-apollo'
+import { createMockClient } from 'mock-apollo-client'
+import { adminOpenCreations } from '../graphql/adminOpenCreations'
+
+const mockClient = createMockClient()
+const apolloProvider = new VueApollo({
+  defaultClient: mockClient,
+})
 
 const localVue = global.localVue
+localVue.use(VueApollo)
 
-const apolloMutateMock = jest.fn().mockResolvedValue({
-  data: {
-    adminCreateContribution: [0, 0, 0],
-  },
-})
 const stateCommitMock = jest.fn()
 
 const mocks = {
@@ -18,9 +22,6 @@ const mocks = {
     const date = new Date(d)
     return date.toISOString().split('T')[0]
   }),
-  $apollo: {
-    mutate: apolloMutateMock,
-  },
   $store: {
     commit: stateCommitMock,
   },
@@ -31,7 +32,8 @@ const propsData = {
   creation: [],
 }
 
-const now = new Date(Date.now())
+const now = new Date()
+
 const getCreationDate = (sub) => {
   const date = sub === 0 ? now : new Date(now.getFullYear(), now.getMonth() - sub, 1, 0)
   return date.toISOString().split('T')[0]
@@ -40,8 +42,43 @@ const getCreationDate = (sub) => {
 describe('CreationFormular', () => {
   let wrapper
 
+  const adminOpenCreationsMock = jest.fn()
+  const adminCreateContributionMock = jest.fn()
+  mockClient.setRequestHandler(
+    adminOpenCreations,
+    adminOpenCreationsMock.mockResolvedValue({
+      data: {
+        adminOpenCreations: [
+          {
+            month: new Date(now.getFullYear(), now.getMonth() - 2).getMonth(),
+            year: new Date(now.getFullYear(), now.getMonth() - 2).getFullYear(),
+            amount: '200',
+          },
+          {
+            month: new Date(now.getFullYear(), now.getMonth() - 1).getMonth(),
+            year: new Date(now.getFullYear(), now.getMonth() - 1).getFullYear(),
+            amount: '400',
+          },
+          {
+            month: now.getMonth(),
+            year: now.getFullYear(),
+            amount: '600',
+          },
+        ],
+      },
+    }),
+  )
+  mockClient.setRequestHandler(
+    adminCreateContribution,
+    adminCreateContributionMock.mockResolvedValue({
+      data: {
+        adminCreateContribution: [0, 0, 0],
+      },
+    }),
+  )
+
   const Wrapper = () => {
-    return mount(CreationFormular, { localVue, mocks, propsData })
+    return mount(CreationFormular, { localVue, mocks, propsData, apolloProvider })
   }
 
   describe('mount', () => {
@@ -107,17 +144,12 @@ describe('CreationFormular', () => {
             })
 
             it('sends ... to apollo', () => {
-              expect(apolloMutateMock).toBeCalledWith(
+              expect(adminCreateContributionMock).toBeCalledWith({
-                expect.objectContaining({
-                  mutation: adminCreateContribution,
-                  variables: {
                 email: 'benjamin@bluemchen.de',
                 creationDate: getCreationDate(2),
                 amount: 90,
                 memo: 'Test create coins',
-                  },
+              })
-                }),
-              )
             })
 
             it('emits update-user-data', () => {
@@ -144,7 +176,7 @@ describe('CreationFormular', () => {
 
           describe('sendForm with server error', () => {
             beforeEach(async () => {
-              apolloMutateMock.mockRejectedValueOnce({ message: 'Ouch!' })
+              adminCreateContributionMock.mockRejectedValueOnce({ message: 'Ouch!' })
               await wrapper.find('.test-submit').trigger('click')
             })
 
@@ -212,7 +244,7 @@ describe('CreationFormular', () => {
             })
 
             it('sends ... to apollo', () => {
-              expect(apolloMutateMock).toBeCalled()
+              expect(adminCreateContributionMock).toBeCalled()
             })
           })
 
@@ -275,7 +307,7 @@ describe('CreationFormular', () => {
             })
 
             it('sends mutation to apollo', () => {
-              expect(apolloMutateMock).toBeCalled()
+              expect(adminCreateContributionMock).toBeCalled()
             })
 
             it('toast success message', () => {

admin/src/components/CreationFormular.vue

@@ -117,10 +117,6 @@ export default {
         return {}
       },
     },
-    creation: {
-      type: Array,
-      required: true,
-    },
   },
   data() {
     return {
@@ -129,6 +125,7 @@ export default {
       rangeMin: 0,
       rangeMax: 1000,
       selected: '',
+      userId: this.item.userId,
     }
   },
   methods: {
@@ -136,7 +133,7 @@ export default {
       // do we want to reset the memo everytime the month changes?
       this.text = this.$t('creation_form.creation_for') + ' ' + name.short + ' ' + name.year
       this.rangeMin = 0
-      this.rangeMax = name.creation
+      this.rangeMax = Number(name.creation)
     },
     submitCreation() {
       this.$apollo
@@ -167,6 +164,10 @@ export default {
           this.$refs.creationForm.reset()
           this.value = 0
         })
+        .finally(() => {
+          this.$apollo.queries.OpenCreations.refetch()
+          this.selected = ''
+        })
     },
   },
   watch: {

admin/src/components/DeletedUserFormular.spec.js

@@ -35,6 +35,7 @@ const propsData = {
 
 describe('DeletedUserFormular', () => {
   let wrapper
+  let spy
 
   const Wrapper = () => {
     return mount(DeletedUserFormular, { localVue, mocks, propsData })
@@ -62,6 +63,10 @@ describe('DeletedUserFormular', () => {
       it('shows a text that you cannot delete yourself', () => {
         expect(wrapper.text()).toBe('removeNotSelf')
       })
+
+      it('has no "delete_user" button', () => {
+        expect(wrapper.find('button').exists()).toBe(false)
+      })
     })
 
     describe('delete other user', () => {
@@ -71,35 +76,32 @@ describe('DeletedUserFormular', () => {
             userId: 1,
             deletedAt: null,
           },
+          static: true,
         })
       })
 
-      it('has a checkbox', () => {
-        expect(wrapper.find('input[type="checkbox"]').exists()).toBe(true)
-      })
-
       it('shows the text "delete_user"', () => {
         expect(wrapper.text()).toBe('delete_user')
       })
 
-      describe('click on checkbox', () => {
+      it('has a "delete_user" button', () => {
-        beforeEach(async () => {
-          await wrapper.find('input[type="checkbox"]').setChecked()
-        })
-
-        it('has a confirmation button', () => {
-          expect(wrapper.find('button').exists()).toBe(true)
-        })
-
-        it('has the button text "delete_user"', () => {
         expect(wrapper.find('button').text()).toBe('delete_user')
       })
 
-        describe('confirm delete with success', () => {
+      describe('click on "delete_user" button', () => {
         beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve(true))
           await wrapper.find('button').trigger('click')
+          await wrapper.vm.$nextTick()
         })
 
+        it('calls the modal', () => {
+          expect(wrapper.emitted('showDeleteModal'))
+          expect(spy).toHaveBeenCalled()
+        })
+
+        describe('confirm delete with success', () => {
           it('calls the API', () => {
             expect(apolloMutateMock).toBeCalledWith(
               expect.objectContaining({
@@ -123,32 +125,20 @@ describe('DeletedUserFormular', () => {
               ]),
             )
           })
-
-          it('unchecks the checkbox', () => {
-            expect(wrapper.find('input').attributes('checked')).toBe(undefined)
-          })
         })
 
         describe('confirm delete with error', () => {
           beforeEach(async () => {
+            spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
             apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
             await wrapper.find('button').trigger('click')
+            await wrapper.vm.$nextTick()
           })
 
           it('toasts an error message', () => {
             expect(toastErrorSpy).toBeCalledWith('Oh no!')
           })
         })
-
-        describe('click on checkbox again', () => {
-          beforeEach(async () => {
-            await wrapper.find('input[type="checkbox"]').setChecked(false)
-          })
-
-          it('has no confirmation button anymore', () => {
-            expect(wrapper.find('button').exists()).toBe(false)
-          })
-        })
       })
     })
 
@@ -162,37 +152,33 @@ describe('DeletedUserFormular', () => {
         })
       })
 
-      it('has a checkbox', () => {
-        expect(wrapper.find('input[type="checkbox"]').exists()).toBe(true)
-      })
-
       it('shows the text "undelete_user"', () => {
         expect(wrapper.text()).toBe('undelete_user')
       })
 
-      describe('click on checkbox', () => {
+      it('has a "undelete_user" button', () => {
+        expect(wrapper.find('button').text()).toBe('undelete_user')
+      })
+
+      describe('click on "undelete_user" button', () => {
         beforeEach(async () => {
           apolloMutateMock.mockResolvedValue({
             data: {
               unDeleteUser: null,
             },
           })
-          await wrapper.find('input[type="checkbox"]').setChecked()
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve(true))
+          await wrapper.find('button').trigger('click')
+          await wrapper.vm.$nextTick()
         })
 
-        it('has a confirmation button', () => {
+        it('calls the modal', () => {
-          expect(wrapper.find('button').exists()).toBe(true)
+          expect(wrapper.emitted('showUndeleteModal'))
-        })
+          expect(spy).toHaveBeenCalled()
-
-        it('has the button text "undelete_user"', () => {
-          expect(wrapper.find('button').text()).toBe('undelete_user')
         })
 
         describe('confirm recover with success', () => {
-          beforeEach(async () => {
-            await wrapper.find('button').trigger('click')
-          })
-
           it('calls the API', () => {
             expect(apolloMutateMock).toBeCalledWith(
               expect.objectContaining({
@@ -205,7 +191,7 @@ describe('DeletedUserFormular', () => {
           })
 
           it('emits update deleted At', () => {
-            expect(wrapper.emitted('updateDeletedAt')).toEqual(
+            expect(wrapper.emitted('updateDeletedAt')).toMatchObject(
               expect.arrayContaining([
                 expect.arrayContaining([
                   {
@@ -216,10 +202,6 @@ describe('DeletedUserFormular', () => {
               ]),
             )
           })
-
-          it('unchecks the checkbox', () => {
-            expect(wrapper.find('input').attributes('checked')).toBe(undefined)
-          })
         })
 
         describe('confirm recover with error', () => {
@@ -232,16 +214,6 @@ describe('DeletedUserFormular', () => {
             expect(toastErrorSpy).toBeCalledWith('Oh no!')
           })
         })
-
-        describe('click on checkbox again', () => {
-          beforeEach(async () => {
-            await wrapper.find('input[type="checkbox"]').setChecked(false)
-          })
-
-          it('has no confirmation button anymore', () => {
-            expect(wrapper.find('button').exists()).toBe(false)
-          })
-        })
       })
     })
   })

admin/src/components/DeletedUserFormular.vue

@@ -4,15 +4,16 @@
       {{ $t('removeNotSelf') }}
     </div>
     <div v-else class="mt-5">
-      <b-form-checkbox switch size="lg" v-model="checked">
-        <div>{{ item.deletedAt ? $t('undelete_user') : $t('delete_user') }}</div>
-      </b-form-checkbox>
-
       <div class="mt-3 mb-5">
-        <b-button v-if="checked && item.deletedAt === null" variant="danger" @click="deleteUser">
+        <b-button
+          v-if="!item.deletedAt"
+          variant="danger"
+          v-b-modal.delete-user-modal
+          @click="showDeleteModal()"
+        >
           {{ $t('delete_user') }}
         </b-button>
-        <b-button v-if="checked && item.deletedAt !== null" variant="success" @click="unDeleteUser">
+        <b-button v-else variant="success" v-b-modal.delete-user-modal @click="showUndeleteModal()">
           {{ $t('undelete_user') }}
         </b-button>
       </div>
@@ -31,12 +32,56 @@ export default {
       required: true,
     },
   },
-  data() {
-    return {
-      checked: false,
-    }
-  },
   methods: {
+    showDeleteModal() {
+      this.$bvModal
+        .msgBoxConfirm(
+          this.$t('overlay.deleteUser.question', {
+            username: `${this.item.firstName} ${this.item.lastName}`,
+          }),
+          {
+            cancelTitle: this.$t('overlay.cancel'),
+            centered: true,
+            hideHeaderClose: true,
+            title: this.$t('overlay.deleteUser.title'),
+            okTitle: this.$t('overlay.deleteUser.yes'),
+            okVariant: 'danger',
+            static: true,
+          },
+        )
+        .then((okClicked) => {
+          if (okClicked) {
+            this.deleteUser()
+          }
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
+    },
+    showUndeleteModal() {
+      this.$bvModal
+        .msgBoxConfirm(
+          this.$t('overlay.undeleteUser.question', {
+            username: `${this.item.firstName} ${this.item.lastName}`,
+          }),
+          {
+            cancelTitle: this.$t('overlay.cancel'),
+            centered: true,
+            hideHeaderClose: true,
+            title: this.$t('overlay.undeleteUser.title'),
+            okTitle: this.$t('overlay.undeleteUser.yes'),
+            okVariant: 'success',
+          },
+        )
+        .then((okClicked) => {
+          if (okClicked) {
+            this.unDeleteUser()
+          }
+        })
+        .catch((error) => {
+          this.toastError(error.message)
+        })
+    },
     deleteUser() {
       this.$apollo
         .mutate({
@@ -50,7 +95,6 @@ export default {
             userId: this.item.userId,
             deletedAt: result.data.deleteUser,
           })
-          this.checked = false
         })
         .catch((error) => {
           this.toastError(error.message)
@@ -69,7 +113,6 @@ export default {
             userId: this.item.userId,
             deletedAt: result.data.unDeleteUser,
           })
-          this.checked = false
         })
         .catch((error) => {
           this.toastError(error.message)

admin/src/components/EditCreationFormular.spec.js

@@ -1,19 +1,18 @@
 import { mount } from '@vue/test-utils'
 import EditCreationFormular from './EditCreationFormular'
 import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
+import VueApollo from 'vue-apollo'
+import { createMockClient } from 'mock-apollo-client'
+import { adminOpenCreations } from '../graphql/adminOpenCreations'
+import { adminUpdateContribution } from '../graphql/adminUpdateContribution'
+
+const mockClient = createMockClient()
+const apolloProvider = new VueApollo({
+  defaultClient: mockClient,
+})
 
 const localVue = global.localVue
-
+localVue.use(VueApollo)
-const apolloMutateMock = jest.fn().mockResolvedValue({
-  data: {
-    adminUpdateContribution: {
-      creation: [0, 0, 0],
-      amount: 500,
-      date: new Date(),
-      memo: 'Test Schöpfung 2',
-    },
-  },
-})
 
 const stateCommitMock = jest.fn()
 
@@ -23,22 +22,18 @@ const mocks = {
     const date = new Date(d)
     return date.toISOString().split('T')[0]
   }),
-  $apollo: {
-    mutate: apolloMutateMock,
-  },
   $store: {
     commit: stateCommitMock,
   },
 }
 
-const now = new Date(Date.now())
+const now = new Date()
 const getCreationDate = (sub) => {
   const date = sub === 0 ? now : new Date(now.getFullYear(), now.getMonth() - sub, 1, 0)
   return date.toISOString().split('T')[0]
 }
 
 const propsData = {
-  creation: [200, 400, 600],
   creationUserData: {
     memo: 'Test schöpfung 1',
     amount: 100,
@@ -46,20 +41,65 @@ const propsData = {
   },
   item: {
     id: 0,
-    email: 'bob@baumeister.de',
+    amount: '300',
+    contributionDate: `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`,
   },
 }
 
+const data = () => {
+  return { creation: ['1000', '1000', '400'] }
+}
+
 describe('EditCreationFormular', () => {
   let wrapper
 
+  const adminUpdateContributionMock = jest.fn()
+  const adminOpenCreationsMock = jest.fn()
+  mockClient.setRequestHandler(
+    adminOpenCreations,
+    adminOpenCreationsMock.mockResolvedValue({
+      data: {
+        adminOpenCreations: [
+          {
+            month: new Date(now.getFullYear(), now.getMonth() - 2).getMonth(),
+            year: new Date(now.getFullYear(), now.getMonth() - 2).getFullYear(),
+            amount: '1000',
+          },
+          {
+            month: new Date(now.getFullYear(), now.getMonth() - 1).getMonth(),
+            year: new Date(now.getFullYear(), now.getMonth() - 1).getFullYear(),
+            amount: '1000',
+          },
+          {
+            month: now.getMonth(),
+            year: now.getFullYear(),
+            amount: '400',
+          },
+        ],
+      },
+    }),
+  )
+  mockClient.setRequestHandler(
+    adminUpdateContribution,
+    adminUpdateContributionMock.mockResolvedValue({
+      data: {
+        adminUpdateContribution: {
+          amount: '600',
+          date: new Date(),
+          memo: 'This is my memo',
+        },
+      },
+    }),
+  )
+
   const Wrapper = () => {
-    return mount(EditCreationFormular, { localVue, mocks, propsData })
+    return mount(EditCreationFormular, { localVue, mocks, propsData, data, apolloProvider })
   }
 
   describe('mount', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       wrapper = Wrapper()
+      await wrapper.vm.$nextTick()
     })
 
     it('has a DIV element with the class.component-edit-creation-formular', () => {
@@ -89,42 +129,16 @@ describe('EditCreationFormular', () => {
         })
 
         it('calls the API', () => {
-          expect(apolloMutateMock).toBeCalledWith(
+          expect(adminUpdateContributionMock).toBeCalledWith({
-            expect.objectContaining({
-              variables: {
             id: 0,
-                email: 'bob@baumeister.de',
             creationDate: getCreationDate(0),
             amount: 500,
             memo: 'Test Schöpfung 2',
-              },
-            }),
-          )
           })
-
-        it('emits update-user-data', () => {
-          expect(wrapper.emitted('update-user-data')).toEqual([
-            [
-              {
-                id: 0,
-                email: 'bob@baumeister.de',
-              },
-              [0, 0, 0],
-            ],
-          ])
         })
 
         it('emits update-creation-data', () => {
-          expect(wrapper.emitted('update-creation-data')).toEqual([
+          expect(wrapper.emitted('update-creation-data')).toBeTruthy()
-            [
-              {
-                amount: 500,
-                date: expect.any(Date),
-                memo: 'Test Schöpfung 2',
-                row: expect.any(Object),
-              },
-            ],
-          ])
         })
 
         it('toasts a success message', () => {
@@ -134,7 +148,7 @@ describe('EditCreationFormular', () => {
 
       describe('change and save memo and value with error', () => {
         beforeEach(async () => {
-          apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+          adminUpdateContributionMock.mockRejectedValue({ message: 'Oh no!' })
           await wrapper.find('input[type="number"]').setValue(500)
           await wrapper.find('textarea').setValue('Test Schöpfung 2')
           await wrapper.find('.test-submit').trigger('click')

admin/src/components/EditCreationFormular.vue

@@ -96,18 +96,14 @@ export default {
       type: Object,
       required: true,
     },
-    creation: {
-      type: Array,
-      required: true,
-    },
   },
   data() {
     return {
       text: !this.creationUserData.memo ? '' : this.creationUserData.memo,
       value: !this.creationUserData.amount ? 0 : Number(this.creationUserData.amount),
       rangeMin: 0,
-      rangeMax: 1000,
+      selected: this.selectedComputed,
-      selected: '',
+      userId: this.item.userId,
     }
   },
   methods: {
@@ -117,20 +113,13 @@ export default {
           mutation: adminUpdateContribution,
           variables: {
             id: this.item.id,
-            email: this.item.email,
             creationDate: this.selected.date,
             amount: Number(this.value),
             memo: this.text,
           },
         })
         .then((result) => {
-          this.$emit('update-user-data', this.item, result.data.adminUpdateContribution.creation)
+          this.$emit('update-creation-data')
-          this.$emit('update-creation-data', {
-            amount: Number(result.data.adminUpdateContribution.amount),
-            date: result.data.adminUpdateContribution.date,
-            memo: result.data.adminUpdateContribution.memo,
-            row: this.row,
-          })
           this.toastSuccess(
             this.$t('creation_form.toasted_update', {
               value: this.value,
@@ -149,15 +138,29 @@ export default {
           // Den geschöpften Wert auf o setzen
           this.value = 0
         })
+        .finally(() => {
+          this.$apollo.queries.OpenCreations.refetch()
+        })
     },
   },
-  created() {
+  computed: {
-    if (this.creationUserData.date) {
+    creationIndex() {
-      const month = this.$d(new Date(this.creationUserData.date), 'month')
+      const month = this.$d(new Date(this.item.contributionDate), 'month')
-      const index = this.radioOptions.findIndex((obj) => obj.item.short === month)
+      return this.radioOptions.findIndex((obj) => {
-      this.selected = this.radioOptions[index].item
+        return obj.item.short === month
-      this.rangeMax = Number(this.creation[index]) + Number(this.creationUserData.amount)
+      })
-    }
+    },
+    selectedComputed() {
+      return this.radioOptions[this.creationIndex].item
+    },
+    rangeMax() {
+      return Number(this.creation[this.creationIndex]) + Number(this.item.amount)
+    },
+  },
+  watch: {
+    selectedComputed() {
+      this.selected = this.selectedComputed
+    },
   },
 }
 </script>

admin/src/components/Tables/OpenCreationsTable.spec.js

@@ -5,7 +5,6 @@ const localVue = global.localVue
 
 const apolloMutateMock = jest.fn().mockResolvedValue({})
 const apolloQueryMock = jest.fn().mockResolvedValue({})
-const toggleDetailsMock = jest.fn()
 
 const propsData = {
   items: [
@@ -17,7 +16,7 @@ const propsData = {
       amount: 300,
       memo: 'Aktives Grundeinkommen für Januar 2022',
       date: '2022-01-01T00:00:00.000Z',
-      moderator: 1,
+      moderatorId: 1,
       creation: [700, 1000, 1000],
       __typename: 'PendingCreation',
     },
@@ -29,7 +28,7 @@ const propsData = {
       amount: 210,
       memo: 'Aktives Grundeinkommen für Januar 2022',
       date: '2022-01-01T00:00:00.000Z',
-      moderator: null,
+      moderatorId: null,
       creation: [790, 1000, 1000],
       __typename: 'PendingCreation',
     },
@@ -41,7 +40,7 @@ const propsData = {
       amount: 330,
       memo: 'Aktives Grundeinkommen für Januar 2022',
       date: '2022-01-01T00:00:00.000Z',
-      moderator: 1,
+      moderatorId: 1,
       creation: [670, 1000, 1000],
       __typename: 'PendingCreation',
     },
@@ -83,7 +82,7 @@ const mocks = {
   $store: {
     state: {
       moderator: {
-        id: 0,
+        id: 1,
         name: 'test moderator',
       },
     },
@@ -132,14 +131,6 @@ describe('OpenCreationsTable', () => {
       })
     })
 
-    describe('call updateUserData', () => {
-      it('user creations has updated data', async () => {
-        wrapper.vm.updateUserData(propsData.items[0], [444, 555, 666])
-        await wrapper.vm.$nextTick()
-        expect(wrapper.vm.items[0].creation).toEqual([444, 555, 666])
-      })
-    })
-
     describe('call updateState', () => {
       beforeEach(() => {
         wrapper.vm.updateState(4)
@@ -149,40 +140,5 @@ describe('OpenCreationsTable', () => {
         expect(wrapper.vm.$root.$emit('update-state', 4)).toBeTruthy()
       })
     })
-
-    describe('call updateCreationData', () => {
-      const date = new Date()
-      beforeEach(() => {
-        wrapper.vm.updateCreationData({
-          amount: Number(80.0),
-          date: date,
-          memo: 'Test memo',
-          row: {
-            item: {},
-            detailsShowing: false,
-            toggleDetails: toggleDetailsMock,
-          },
-        })
-      })
-
-      it('emits update-state', () => {
-        expect(
-          wrapper.vm.$emit('update-contributions', {
-            amount: Number(80.0),
-            date: date,
-            memo: 'Test memo',
-            row: {
-              item: {},
-              detailsShowing: false,
-              toggleDetails: toggleDetailsMock,
-            },
-          }),
-        ).toBeTruthy()
-      })
-
-      it('calls toggleDetails', () => {
-        expect(toggleDetailsMock).toBeCalled()
-      })
-    })
   })
 })

admin/src/components/Tables/OpenCreationsTable.vue

@@ -27,9 +27,10 @@
       <template #cell(editCreation)="row">
         <div v-if="!myself(row.item)">
           <b-button
-            v-if="row.item.moderator"
+            v-if="row.item.moderatorId"
             variant="info"
             size="md"
+            :index="0"
             @click="rowToggleDetails(row, 0)"
             class="mr-2"
           >
@@ -89,14 +90,13 @@
           @row-toggle-details="rowToggleDetails(row, 0)"
         >
           <template #show-creation>
-            <div v-if="row.item.moderator">
+            <div v-if="row.item.moderatorId">
               <edit-creation-formular
                 type="singleCreation"
-                :creation="row.item.creation"
                 :item="row.item"
                 :row="row"
                 :creationUserData="creationUserData"
-                @update-creation-data="updateCreationData"
+                @update-creation-data="$emit('update-contributions')"
               />
             </div>
             <div v-else>
@@ -104,7 +104,6 @@
                 :contributionId="row.item.id"
                 :contributionState="row.item.state"
                 @update-state="updateState"
-                @update-user-data="updateUserData"
               />
             </div>
           </template>
@@ -146,22 +145,9 @@ export default {
       required: true,
     },
   },
-  data() {
-    return {
-      creationUserData: {
-        amount: null,
-        date: null,
-        memo: null,
-        moderator: null,
-      },
-    }
-  },
   methods: {
     myself(item) {
-      return (
+      return item.userId === this.$store.state.moderator.id
-        `${item.firstName} ${item.lastName}` ===
-        `${this.$store.state.moderator.firstName} ${this.$store.state.moderator.lastName}`
-      )
     },
     getStatusIcon(status) {
       return iconMap[status] ? iconMap[status] : 'default-icon'
@@ -174,16 +160,6 @@ export default {
       if (item.state === 'IN_PROGRESS') return 'table-primary'
       if (item.state === 'PENDING') return 'table-primary'
     },
-    updateCreationData(data) {
-      const row = data.row
-      this.$emit('update-contributions', data)
-      delete data.row
-      this.creationUserData = { ...this.creationUserData, ...data }
-      row.toggleDetails()
-    },
-    updateUserData(rowItem, newCreation) {
-      rowItem.creation = newCreation
-    },
     updateState(id) {
       this.$emit('update-state', id)
     },

admin/src/graphql/adminListContributions.js

@@ -32,6 +32,8 @@ export const adminListContributions = gql`
         deniedBy
         deletedAt
         deletedBy
+        moderatorId
+        userId
       }
     }
   }

admin/src/graphql/adminOpenCreations.js

@@ -0,0 +1,11 @@
+import gql from 'graphql-tag'
+
+export const adminOpenCreations = gql`
+  query ($userId: Int!) {
+    adminOpenCreations(userId: $userId) {
+      year
+      month
+      amount
+    }
+  }
+`

admin/src/graphql/adminUpdateContribution.js

@@ -1,18 +1,11 @@
 import gql from 'graphql-tag'
 
 export const adminUpdateContribution = gql`
-  mutation ($id: Int!, $email: String!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
+  mutation ($id: Int!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
-    adminUpdateContribution(
+    adminUpdateContribution(id: $id, amount: $amount, memo: $memo, creationDate: $creationDate) {
-      id: $id
-      email: $email
-      amount: $amount
-      memo: $memo
-      creationDate: $creationDate
-    ) {
       amount
       date
       memo
-      creation
     }
   }
 `

admin/src/locales/de.json

@@ -1,6 +1,7 @@
 {
   "all_emails": "Alle Nutzer",
   "back": "zurück",
+  "change_user_role": "Nutzerrolle ändern",
   "chat": "Chat",
   "contributionLink": {
     "amount": "Betrag",
@@ -114,6 +115,11 @@
   "open_creations": "Offene Schöpfungen",
   "overlay": {
     "cancel": "Abbrechen",
+    "changeUserRole": {
+      "question": "Willst du die Rolle von {username} wirklich zu {newRole} ändern?",
+      "title": "Nutzerrolle ändern",
+      "yes": "Ja, Nutzerrolle ändern"
+    },
     "confirm": {
       "question": "Willst du diesen Gemeinwohl-Beitrag wirklich bestätigen und gutschreiben?",
       "text": "Nach dem Speichern ist der Datensatz nicht mehr änderbar. Bitte überprüfe genau, dass alles stimmt.",
@@ -126,11 +132,21 @@
       "title": "Gemeinwohl-Beitrag löschen!",
       "yes": "Ja, Beitrag löschen!"
     },
+    "deleteUser": {
+      "question": "Willst du {username} wirklich löschen?",
+      "title": "Nutzer löschen",
+      "yes": "Ja, Nutzer löschen"
+    },
     "deny": {
       "question": "Willst du diesen Gemeinwohl-Beitrag  wirklich ablehnen?",
       "text": "Nach dem Speichern ist der Datensatz nicht mehr änderbar und kann auch nicht mehr gelöscht werden. Bitte überprüfe genau, dass alles stimmt.",
       "title": "Gemeinwohl-Beitrag ablehnen!",
       "yes": "Ja, Beitrag ablehnen und speichern!"
+    },
+    "undeleteUser": {
+      "question": "Willst du wirklich {username} wiederherstellen?",
+      "title": "Nutzer wiederherstellen",
+      "yes": "Ja, Nutzer wiederherstellen"
     }
   },
   "redeemed": "eingelöst",

admin/src/locales/en.json

@@ -1,6 +1,7 @@
 {
   "all_emails": "All users",
   "back": "back",
+  "change_user_role": "Change user role",
   "chat": "Chat",
   "contributionLink": {
     "amount": "Amount",
@@ -114,6 +115,11 @@
   "open_creations": "Open creations",
   "overlay": {
     "cancel": "Cancel",
+    "changeUserRole": {
+      "question": "Do you really want to change {username}'s role to {newRole}?",
+      "title": "Change user role",
+      "yes": "Yes, change user role"
+    },
     "confirm": {
       "question": "Do you really want to carry out and finally save this pre-stored creation?",
       "text": "After saving, the record can no longer be changed. Please check carefully that everything is correct.",
@@ -126,11 +132,21 @@
       "title": "Delete creation!",
       "yes": "Yes, delete and save creation!"
     },
+    "deleteUser": {
+      "question": "Do you really want to delete {username}?",
+      "title": "Delete user",
+      "yes": "Yes, delete user"
+    },
     "deny": {
       "question": "Do you really want to carry out and finally save this pre-stored creation?",
       "text": "After saving, the record can no longer be changed or deleted. Please check carefully that everything is correct.",
       "title": "Reject creation!",
       "yes": "Yes, reject and save creation!"
+    },
+    "undeleteUser": {
+      "question": "Do you really want to undelete {username}",
+      "title": "Undelete user",
+      "yes": "Yes,undelete user"
     }
   },
   "redeemed": "redeemed",

admin/src/mixins/creationMonths.js

@@ -1,9 +1,11 @@
+import { adminOpenCreations } from '../graphql/adminOpenCreations'
+
 export const creationMonths = {
-  props: {
+  data() {
-    creation: {
+    return {
-      type: Array,
+      creation: [1000, 1000, 1000],
-      default: () => [1000, 1000, 1000],
+      userId: 0,
-    },
+    }
   },
   computed: {
     creationDates() {
@@ -38,4 +40,23 @@ export const creationMonths = {
       return this.creationDates.map((date) => this.$d(date, 'monthShort')).join(' | ')
     },
   },
+  apollo: {
+    OpenCreations: {
+      query() {
+        return adminOpenCreations
+      },
+      variables() {
+        return {
+          userId: this.userId,
+        }
+      },
+      fetchPolicy: 'no-cache',
+      update({ adminOpenCreations }) {
+        this.creation = adminOpenCreations.map((obj) => obj.amount)
+      },
+      error({ message }) {
+        this.toastError(message)
+      },
+    },
+  },
 }

admin/src/pages/CreationConfirm.vue

@@ -44,7 +44,7 @@
       :fields="fields"
       @show-overlay="showOverlay"
       @update-state="updateStatus"
-      @update-contributions="$apollo.queries.AllContributions.refetch()"
+      @update-contributions="$apollo.queries.ListAllContributions.refetch()"
     />
 
     <b-pagination
@@ -217,7 +217,7 @@ export default {
               return this.formatDateOrDash(value)
             },
           },
-          { key: 'moderator', label: this.$t('moderator') },
+          { key: 'moderatorId', label: this.$t('moderator') },
           { key: 'editCreation', label: this.$t('chat') },
           { key: 'confirm', label: this.$t('save') },
         ],

admin/src/pages/Overview.spec.js

@@ -42,7 +42,7 @@ const defaultData = () => {
           amount: 500,
           memo: 'Danke für alles',
           date: new Date(),
-          moderator: 1,
+          moderatorId: 1,
           state: 'PENDING',
           creation: [500, 500, 500],
           messagesCount: 0,
@@ -64,7 +64,7 @@ const defaultData = () => {
           amount: 1000000,
           memo: 'Gut Ergattert',
           date: new Date(),
-          moderator: 1,
+          moderatorId: 1,
           state: 'PENDING',
           creation: [500, 500, 500],
           messagesCount: 0,

admin/src/pages/UserSearch.spec.js

@@ -25,7 +25,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
           email: 'benjamin@bluemchen.de',
           creation: [1000, 1000, 1000],
           emailChecked: true,
-          deletedAt: null,
+          deletedAt: new Date(),
         },
         {
           userId: 3,
@@ -243,6 +243,17 @@ describe('UserSearch', () => {
       })
     })
 
+    describe('recover user', () => {
+      const userId = 2
+      beforeEach(() => {
+        wrapper.findComponent({ name: 'SearchUserTable' }).vm.$emit('updateDeletedAt', userId, null)
+      })
+
+      it('toasts a success message', () => {
+        expect(toastSuccessSpy).toBeCalledWith('user_recovered')
+      })
+    })
+
     describe('apollo returns error', () => {
       beforeEach(() => {
         apolloQueryMock.mockRejectedValue({

backend/.eslintrc.js

@@ -1,12 +1,27 @@
+// eslint-disable-next-line import/no-commonjs, import/unambiguous
 module.exports = {
   root: true,
   env: {
     node: true,
   },
   parser: '@typescript-eslint/parser',
-  plugins: ['prettier', '@typescript-eslint', 'type-graphql', 'jest'],
+  plugins: ['prettier', '@typescript-eslint', 'type-graphql', 'jest', 'import'],
-  extends: ['standard', 'eslint:recommended', 'plugin:prettier/recommended'],
+  extends: [
-  // add your custom rules here
+    'standard',
+    'eslint:recommended',
+    'plugin:prettier/recommended',
+    'plugin:import/recommended',
+    'plugin:import/typescript',
+  ],
+  settings: {
+    'import/parsers': {
+      '@typescript-eslint/parser': ['.ts', '.tsx'],
+    },
+    'import/resolver': {
+      typescript: true,
+      node: true,
+    },
+  },
   rules: {
     'no-console': ['error'],
     'no-debugger': 'error',
@@ -22,6 +37,70 @@ module.exports = {
     'jest/no-identical-title': 'error',
     'jest/prefer-to-have-length': 'error',
     'jest/valid-expect': 'error',
+    // import
+    'import/export': 'error',
+    'import/no-deprecated': 'error',
+    'import/no-empty-named-blocks': 'error',
+    'import/no-extraneous-dependencies': 'error',
+    'import/no-mutable-exports': 'error',
+    'import/no-unused-modules': 'error',
+    'import/no-named-as-default': 'error',
+    'import/no-named-as-default-member': 'error',
+    'import/no-amd': 'error',
+    'import/no-commonjs': 'error',
+    'import/no-import-module-exports': 'error',
+    'import/no-nodejs-modules': 'off',
+    'import/unambiguous': 'error',
+    'import/default': 'error',
+    'import/named': 'error',
+    'import/namespace': 'error',
+    'import/no-absolute-path': 'error',
+    'import/no-cycle': 'off',
+    'import/no-dynamic-require': 'error',
+    'import/no-internal-modules': 'off',
+    'import/no-relative-packages': 'error',
+    'import/no-relative-parent-imports': ['error', { ignore: ['@/*'] }],
+    'import/no-self-import': 'error',
+    'import/no-unresolved': 'error',
+    'import/no-useless-path-segments': 'error',
+    'import/no-webpack-loader-syntax': 'error',
+    'import/consistent-type-specifier-style': 'error',
+    'import/exports-last': 'off',
+    'import/extensions': 'error',
+    'import/first': 'error',
+    'import/group-exports': 'off',
+    'import/newline-after-import': 'error',
+    'import/no-anonymous-default-export': 'error',
+    'import/no-default-export': 'off',
+    'import/no-duplicates': 'error',
+    'import/no-named-default': 'error',
+    'import/no-namespace': 'error',
+    'import/no-unassigned-import': 'error',
+    'import/order': [
+      'error',
+      {
+        groups: ['builtin', 'external', 'internal', 'parent', 'sibling', 'index', 'object', 'type'],
+        'newlines-between': 'always',
+        pathGroups: [
+          {
+            pattern: '@?*/**',
+            group: 'external',
+            position: 'after',
+          },
+          {
+            pattern: '@/**',
+            group: 'external',
+            position: 'after',
+          },
+        ],
+        alphabetize: {
+          order: 'asc' /* sort in ascending order. Options: ['ignore', 'asc', 'desc'] */,
+          caseInsensitive: true /* ignore case. Options: [true, false] */,
+        },
+        distinctGroup: true,
+      },
+    ],
+    'import/prefer-default-export': 'off', // TODO
   },
   overrides: [
     // only for ts files
@@ -38,9 +117,11 @@ module.exports = {
         'no-void': ['error', { allowAsStatement: true }],
         // ignore prefer-regexp-exec rule to allow string.match(regex)
         '@typescript-eslint/prefer-regexp-exec': 'off',
+        // this should not run on ts files: https://github.com/import-js/eslint-plugin-import/issues/2215#issuecomment-911245486
+        'import/unambiguous': 'off',
       },
       parserOptions: {
-        tsconfigRootDir: __dirname,
+        tsconfigRootDir: './',
         project: ['./tsconfig.json'],
         // this is to properly reference the referenced project database without requirement of compiling it
         EXPERIMENTAL_useSourceOfProjectReferenceRedirect: true,

backend/jest.config.js

@@ -1,4 +1,5 @@
 /** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+// eslint-disable-next-line import/no-commonjs, import/unambiguous
 module.exports = {
   verbose: true,
   preset: 'ts-jest',

backend/package.json

@@ -12,7 +12,7 @@
     "clean": "tsc --build --clean",
     "start": "cross-env TZ=UTC TS_NODE_BASEURL=./build node -r tsconfig-paths/register build/src/index.js",
     "dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r tsconfig-paths/register src/index.ts",
-    "lint": "eslint --max-warnings=0 --ext .js,.ts .",
+    "lint": "eslint --max-warnings=0 .",
     "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --forceExit --detectOpenHandles",
     "seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts",
     "klicktipp": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/util/klicktipp.ts",
@@ -29,6 +29,7 @@
     "dotenv": "^10.0.0",
     "email-templates": "^10.0.1",
     "express": "^4.17.1",
+    "gradido-database": "file:../database",
     "graphql": "^15.5.1",
     "graphql-request": "5.0.0",
     "i18n": "^0.15.1",
@@ -61,13 +62,15 @@
     "eslint": "^7.29.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.23.4",
+    "eslint-import-resolver-typescript": "^3.5.3",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-type-graphql": "^1.0.0",
     "faker": "^5.5.3",
+    "graphql-tag": "^2.12.6",
     "jest": "^27.2.4",
     "klicktipp-api": "^1.0.2",
     "nodemon": "^2.0.7",

backend/src/apis/HttpRequest.ts

@@ -2,8 +2,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import axios from 'axios'
 
-import { backendLogger as logger } from '@/server/logger'
 import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const apiPost = async (url: string, payload: unknown): Promise<any> => {

backend/src/apis/KlicktippController.ts

@@ -4,9 +4,11 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import KlicktippConnector from 'klicktipp-api'
 import CONFIG from '@/config'
 
+// eslint-disable-next-line import/no-relative-parent-imports
+import KlicktippConnector from 'klicktipp-api'
+
 const klicktippConnector = new KlicktippConnector()
 
 export const klicktippSignIn = async (

backend/src/auth/JWT.ts

@@ -1,19 +1,21 @@
-import jwt from 'jsonwebtoken'
+import { verify, sign } from 'jsonwebtoken'
+
 import CONFIG from '@/config/'
-import { CustomJwtPayload } from './CustomJwtPayload'
 import LogError from '@/server/LogError'
 
+import { CustomJwtPayload } from './CustomJwtPayload'
+
 export const decode = (token: string): CustomJwtPayload | null => {
   if (!token) throw new LogError('401 Unauthorized')
   try {
-    return <CustomJwtPayload>jwt.verify(token, CONFIG.JWT_SECRET)
+    return <CustomJwtPayload>verify(token, CONFIG.JWT_SECRET)
   } catch (err) {
     return null
   }
 }
 
 export const encode = (gradidoID: string): string => {
-  const token = jwt.sign({ gradidoID }, CONFIG.JWT_SECRET, {
+  const token = sign({ gradidoID }, CONFIG.JWT_SECRET, {
     expiresIn: CONFIG.JWT_EXPIRES_IN,
   })
   return token

backend/src/config/index.ts

@@ -1,7 +1,8 @@
 // ATTENTION: DO NOT PUT ANY SECRETS IN HERE (or the .env)
 
+import { Decimal } from 'decimal.js-light'
 import dotenv from 'dotenv'
-import Decimal from 'decimal.js-light'
+
 dotenv.config()
 
 Decimal.set({

backend/src/emails/sendEmailTranslated.test.ts

@@ -1,8 +1,11 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/unbound-method */
 import { createTransport } from 'nodemailer'
+
 import { logger, i18n } from '@test/testSetup'
+
 import CONFIG from '@/config'
+
 import { sendEmailTranslated } from './sendEmailTranslated'
 
 CONFIG.EMAIL = false

backend/src/emails/sendEmailTranslated.ts

@@ -1,11 +1,13 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
-import CONFIG from '@/config'
-import { backendLogger as logger } from '@/server/logger'
 import path from 'path'
-import { createTransport } from 'nodemailer'
+
 import Email from 'email-templates'
 import i18n from 'i18n'
+import { createTransport } from 'nodemailer'
+
+import CONFIG from '@/config'
 import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
 
 export const sendEmailTranslated = async (params: {
   receiver: {

backend/src/emails/sendEmailVariants.test.ts

@@ -3,10 +3,14 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
+
 import { testEnvironment } from '@test/helpers'
 import { logger, i18n as localization } from '@test/testSetup'
+
 import CONFIG from '@/config'
+
+import { sendEmailTranslated } from './sendEmailTranslated'
 import {
   sendAddedContributionMessageEmail,
   sendAccountActivationEmail,
@@ -18,7 +22,6 @@ import {
   sendTransactionLinkRedeemedEmail,
   sendTransactionReceivedEmail,
 } from './sendEmailVariants'
-import { sendEmailTranslated } from './sendEmailTranslated'
 
 let con: any
 let testEnv: any

backend/src/emails/sendEmailVariants.ts

@@ -1,6 +1,8 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
+
 import CONFIG from '@/config'
 import { decimalSeparatorByLanguage } from '@/util/utilities'
+
 import { sendEmailTranslated } from './sendEmailTranslated'
 
 export const sendAddedContributionMessageEmail = (data: {

backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_CONFIRM = async (

backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_CREATE = async (

backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_DELETE = async (

backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_DENY = async (

backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_CREATE = async (

backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts

@@ -1,6 +1,7 @@
-import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_DELETE = async (

backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE = async (

backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts

@@ -1,7 +1,8 @@
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE = async (

backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_CONTRIBUTION_UPDATE = async (

backend/src/event/EVENT_ADMIN_USER_DELETE.ts

@@ -1,5 +1,6 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_USER_DELETE = async (user: DbUser, moderator: DbUser): Promise<DbEvent> =>

backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts

@@ -1,5 +1,6 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_USER_ROLE_SET = async (

backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts

@@ -1,5 +1,6 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_ADMIN_USER_UNDELETE = async (

backend/src/event/EVENT_CONTRIBUTION_CREATE.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_CONTRIBUTION_CREATE = async (

backend/src/event/EVENT_CONTRIBUTION_DELETE.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_CONTRIBUTION_DELETE = async (

backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts

@@ -1,9 +1,10 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
-import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { Transaction as DbTransaction } from '@entity/Transaction'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_CONTRIBUTION_LINK_REDEEM = async (

backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts

@@ -1,7 +1,8 @@
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_CONTRIBUTION_MESSAGE_CREATE = async (

backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
 import { Contribution as DbContribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_CONTRIBUTION_UPDATE = async (

backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts

@@ -1,5 +1,6 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION = async (user: DbUser): Promise<DbEvent> =>

backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts

@@ -1,5 +1,6 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_EMAIL_ADMIN_CONFIRMATION = async (

backend/src/event/EVENT_EMAIL_CONFIRMATION.ts

@@ -1,5 +1,6 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_EMAIL_CONFIRMATION = async (user: DbUser): Promise<DbEvent> =>

backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts

@@ -1,5 +1,6 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_EMAIL_FORGOT_PASSWORD = async (user: DbUser): Promise<DbEvent> =>

backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
-import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_TRANSACTION_LINK_CREATE = async (

backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts

@@ -1,6 +1,7 @@
-import { User as DbUser } from '@entity/User'
-import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_TRANSACTION_LINK_DELETE = async (

backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
-import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
 import { Event as DbEvent } from '@entity/Event'
+import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_TRANSACTION_LINK_REDEEM = async (

backend/src/event/EVENT_TRANSACTION_RECEIVE.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
-import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
+import { Transaction as DbTransaction } from '@entity/Transaction'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_TRANSACTION_RECEIVE = async (

backend/src/event/EVENT_TRANSACTION_SEND.ts

@@ -1,7 +1,8 @@
-import Decimal from 'decimal.js-light'
-import { User as DbUser } from '@entity/User'
-import { Transaction as DbTransaction } from '@entity/Transaction'
 import { Event as DbEvent } from '@entity/Event'
+import { Transaction as DbTransaction } from '@entity/Transaction'
+import { User as DbUser } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_TRANSACTION_SEND = async (

backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts

@@ -1,5 +1,6 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_USER_ACTIVATE_ACCOUNT = async (user: DbUser): Promise<DbEvent> =>

backend/src/event/EVENT_USER_INFO_UPDATE.ts

@@ -1,5 +1,6 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_USER_INFO_UPDATE = async (user: DbUser): Promise<DbEvent> =>

backend/src/event/EVENT_USER_LOGIN.ts

@@ -1,5 +1,6 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_USER_LOGIN = async (user: DbUser): Promise<DbEvent> =>

backend/src/event/EVENT_USER_LOGOUT.ts

@@ -1,5 +1,6 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_USER_LOGOUT = async (user: DbUser): Promise<DbEvent> =>

backend/src/event/EVENT_USER_REGISTER.ts

@@ -1,5 +1,6 @@
-import { User as DbUser } from '@entity/User'
 import { Event as DbEvent } from '@entity/Event'
+import { User as DbUser } from '@entity/User'
+
 import { Event, EventType } from './Event'
 
 export const EVENT_USER_REGISTER = async (user: DbUser): Promise<DbEvent> =>

backend/src/event/Event.ts

@@ -1,12 +1,13 @@
+import { Contribution as DbContribution } from '@entity/Contribution'
+import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 import { Event as DbEvent } from '@entity/Event'
-import { User as DbUser } from '@entity/User'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
-import { Contribution as DbContribution } from '@entity/Contribution'
+import { User as DbUser } from '@entity/User'
-import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
+import { Decimal } from 'decimal.js-light'
-import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+
-import Decimal from 'decimal.js-light'
+import { EventType } from './EventType'
-import { EventType } from './Event'
 
 export const Event = (
   type: EventType,
@@ -34,7 +35,7 @@ export const Event = (
   return event
 }
 
-export { EventType } from './EventType'
+export { EventType }
 
 export { EVENT_ADMIN_CONTRIBUTION_CONFIRM } from './EVENT_ADMIN_CONTRIBUTION_CONFIRM'
 export { EVENT_ADMIN_CONTRIBUTION_CREATE } from './EVENT_ADMIN_CONTRIBUTION_CREATE'

backend/src/federation/client/1_0/FederationClient.ts

@@ -1,11 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { gql } from 'graphql-request'
-import { backendLogger as logger } from '@/server/logger'
 import { Community as DbCommunity } from '@entity/Community'
-import { GraphQLGetClient } from '../GraphQLGetClient'
+import { gql } from 'graphql-request'
+
+import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
 import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
 
 export async function requestGetPublicKey(dbCom: DbCommunity): Promise<string | undefined> {
   let endpoint = dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'

backend/src/federation/client/1_1/FederationClient.ts

@@ -1,11 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { gql } from 'graphql-request'
-import { backendLogger as logger } from '@/server/logger'
 import { Community as DbCommunity } from '@entity/Community'
-import { GraphQLGetClient } from '../GraphQLGetClient'
+import { gql } from 'graphql-request'
+
+import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
 import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
 
 export async function requestGetPublicKey(dbCom: DbCommunity): Promise<string | undefined> {
   let endpoint = dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/'

backend/src/federation/validateCommunities.test.ts

@@ -5,9 +5,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { logger } from '@test/testSetup'
 import { Community as DbCommunity } from '@entity/Community'
+
 import { testEnvironment, cleanDB } from '@test/helpers'
+import { logger } from '@test/testSetup'
+
 import { validateCommunities } from './validateCommunities'
 
 let con: any

backend/src/federation/validateCommunities.ts

@@ -1,12 +1,14 @@
-import { Community as DbCommunity } from '@entity/Community'
 import { IsNull } from '@dbTools/typeorm'
+import { Community as DbCommunity } from '@entity/Community'
+
+import LogError from '@/server/LogError'
+import { backendLogger as logger } from '@/server/logger'
+
 // eslint-disable-next-line camelcase
 import { requestGetPublicKey as v1_0_requestGetPublicKey } from './client/1_0/FederationClient'
 // eslint-disable-next-line camelcase
 import { requestGetPublicKey as v1_1_requestGetPublicKey } from './client/1_1/FederationClient'
-import { backendLogger as logger } from '@/server/logger'
 import { ApiVersionType } from './enum/apiVersionType'
-import LogError from '@/server/LogError'
 
 export function startValidateCommunities(timerInterval: number): void {
   logger.info(

backend/src/graphql/arg/AdminCreateContributionArgs.ts

@@ -1,5 +1,5 @@
+import { Decimal } from 'decimal.js-light'
 import { ArgsType, Field, InputType } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 
 @InputType()
 @ArgsType()

backend/src/graphql/arg/AdminUpdateContributionArgs.ts

@@ -1,14 +1,11 @@
+import { Decimal } from 'decimal.js-light'
 import { ArgsType, Field, Int } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 
 @ArgsType()
 export default class AdminUpdateContributionArgs {
   @Field(() => Int)
   id: number
 
-  @Field(() => String)
-  email: string
-
   @Field(() => Decimal)
   amount: Decimal
 

backend/src/graphql/arg/ContributionArgs.ts

@@ -1,5 +1,5 @@
+import { Decimal } from 'decimal.js-light'
 import { ArgsType, Field, InputType } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 
 @InputType()
 @ArgsType()

backend/src/graphql/arg/ContributionLinkArgs.ts

@@ -1,5 +1,5 @@
+import { Decimal } from 'decimal.js-light'
 import { ArgsType, Field, Int } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 
 @ArgsType()
 export default class ContributionLinkArgs {

backend/src/graphql/arg/Paginated.ts

@@ -1,5 +1,6 @@
 /* eslint-disable type-graphql/invalid-nullable-input-type */
 import { ArgsType, Field, Int } from 'type-graphql'
+
 import { Order } from '@enum/Order'
 
 @ArgsType()

backend/src/graphql/arg/SearchUsersArgs.ts

@@ -1,4 +1,5 @@
 import { ArgsType, Field, Int } from 'type-graphql'
+
 import SearchUsersFilters from '@arg/SearchUsersFilters'
 
 @ArgsType()

backend/src/graphql/arg/TransactionLinkArgs.ts

@@ -1,5 +1,5 @@
+import { Decimal } from 'decimal.js-light'
 import { ArgsType, Field } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 
 @ArgsType()
 export default class TransactionLinkArgs {

backend/src/graphql/arg/TransactionSendArgs.ts

@@ -1,5 +1,5 @@
+import { Decimal } from 'decimal.js-light'
 import { ArgsType, Field } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 
 @ArgsType()
 export default class TransactionSendArgs {

backend/src/graphql/directive/isAuthorized.ts

@@ -2,13 +2,13 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
+import { User } from '@entity/User'
 import { AuthChecker } from 'type-graphql'
 
-import { decode, encode } from '@/auth/JWT'
-import { ROLE_UNAUTHORIZED, ROLE_USER, ROLE_ADMIN } from '@/auth/ROLES'
-import { RIGHTS } from '@/auth/RIGHTS'
 import { INALIENABLE_RIGHTS } from '@/auth/INALIENABLE_RIGHTS'
-import { User } from '@entity/User'
+import { decode, encode } from '@/auth/JWT'
+import { RIGHTS } from '@/auth/RIGHTS'
+import { ROLE_UNAUTHORIZED, ROLE_USER, ROLE_ADMIN } from '@/auth/ROLES'
 import LogError from '@/server/LogError'
 
 const isAuthorized: AuthChecker<any> = async ({ context }, rights) => {

backend/src/graphql/model/AdminUpdateContribution.ts

@@ -1,5 +1,5 @@
+import { Decimal } from 'decimal.js-light'
 import { ObjectType, Field } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 
 @ObjectType()
 export class AdminUpdateContribution {

backend/src/graphql/model/Balance.ts

@@ -1,5 +1,5 @@
+import { Decimal } from 'decimal.js-light'
 import { ObjectType, Field, Int, Float } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 
 @ObjectType()
 export class Balance {

backend/src/graphql/model/Community.ts

@@ -1,5 +1,5 @@
-import { ObjectType, Field, Int } from 'type-graphql'
 import { Community as DbCommunity } from '@entity/Community'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class Community {

backend/src/graphql/model/CommunityStatistics.ts

@@ -1,5 +1,5 @@
+import { Decimal } from 'decimal.js-light'
 import { ObjectType, Field, Int } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 
 @ObjectType()
 export class DynamicStatisticsFields {

backend/src/graphql/model/Contribution.ts

@@ -1,7 +1,7 @@
-import { ObjectType, Field, Int } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 import { Contribution as dbContribution } from '@entity/Contribution'
 import { User } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class Contribution {
@@ -21,6 +21,8 @@ export class Contribution {
     this.deniedBy = contribution.deniedBy
     this.deletedAt = contribution.deletedAt
     this.deletedBy = contribution.deletedBy
+    this.moderatorId = contribution.moderatorId
+    this.userId = contribution.userId
   }
 
   @Field(() => Int)
@@ -67,6 +69,12 @@ export class Contribution {
 
   @Field(() => String)
   state: string
+
+  @Field(() => Int, { nullable: true })
+  moderatorId: number | null
+
+  @Field(() => Int, { nullable: true })
+  userId: number | null
 }
 
 @ObjectType()

backend/src/graphql/model/ContributionLink.ts

@@ -1,6 +1,7 @@
-import { ObjectType, Field, Int } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 import { ContributionLink as dbContributionLink } from '@entity/ContributionLink'
+import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
+
 import CONFIG from '@/config'
 
 @ObjectType()

backend/src/graphql/model/ContributionLinkList.ts

@@ -1,4 +1,5 @@
 import { ObjectType, Field, Int } from 'type-graphql'
+
 import { ContributionLink } from '@model/ContributionLink'
 
 @ObjectType()

backend/src/graphql/model/ContributionMessage.ts

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

backend/src/graphql/model/Decay.ts

@@ -1,5 +1,5 @@
+import { Decimal } from 'decimal.js-light'
 import { ObjectType, Field, Int } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 
 interface DecayInterface {
   balance: Decimal

backend/src/graphql/model/GdtEntry.ts

@@ -3,6 +3,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { ObjectType, Field, Float, Int } from 'type-graphql'
+
 import { GdtEntryType } from '@enum/GdtEntryType'
 
 @ObjectType()

backend/src/graphql/model/GdtEntryList.ts

@@ -3,9 +3,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { GdtEntry } from './GdtEntry'
 import { ObjectType, Field, Int, Float } from 'type-graphql'
 
+import { GdtEntry } from './GdtEntry'
+
 @ObjectType()
 export class GdtEntryList {
   constructor(json: any) {

backend/src/graphql/model/OpenCreation.ts

@@ -1,5 +1,5 @@
+import { Decimal } from 'decimal.js-light'
 import { ObjectType, Field, Int } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 
 @ObjectType()
 export class OpenCreation {

backend/src/graphql/model/Transaction.ts

@@ -1,8 +1,10 @@
-import { ObjectType, Field, Int } from 'type-graphql'
-import { Decay } from './Decay'
 import { Transaction as dbTransaction } from '@entity/Transaction'
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
+
 import { TransactionTypeId } from '@enum/TransactionTypeId'
+
+import { Decay } from './Decay'
 import { User } from './User'
 
 @ObjectType()

backend/src/graphql/model/TransactionLink.ts

@@ -1,9 +1,11 @@
-import { ObjectType, Field, Int } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
-import { User } from './User'
+import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
+
 import CONFIG from '@/config'
 
+import { User } from './User'
+
 @ObjectType()
 export class TransactionLink {
   constructor(transactionLink: dbTransactionLink, user: User, redeemedBy: User | null = null) {

backend/src/graphql/model/TransactionList.ts

@@ -1,6 +1,7 @@
 import { ObjectType, Field } from 'type-graphql'
-import { Transaction } from './Transaction'
+
 import { Balance } from './Balance'
+import { Transaction } from './Transaction'
 
 @ObjectType()
 export class TransactionList {

backend/src/graphql/model/UnconfirmedContribution.ts

@@ -1,7 +1,7 @@
-import { ObjectType, Field, Int } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 import { Contribution } from '@entity/Contribution'
 import { User } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class UnconfirmedContribution {

backend/src/graphql/model/User.ts

@@ -1,6 +1,7 @@
-import { ObjectType, Field, Int } from 'type-graphql'
-import { KlickTipp } from './KlickTipp'
 import { User as dbUser } from '@entity/User'
+import { ObjectType, Field, Int } from 'type-graphql'
+
+import { KlickTipp } from './KlickTipp'
 import { UserContact } from './UserContact'
 
 @ObjectType()

backend/src/graphql/model/UserAdmin.ts

@@ -1,6 +1,6 @@
-import { ObjectType, Field, Int } from 'type-graphql'
-import Decimal from 'decimal.js-light'
 import { User } from '@entity/User'
+import { Decimal } from 'decimal.js-light'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class UserAdmin {

backend/src/graphql/model/UserContact.ts

@@ -1,5 +1,5 @@
-import { ObjectType, Field, Int } from 'type-graphql'
 import { UserContact as dbUserContact } from '@entity/UserContact'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class UserContact {

backend/src/graphql/resolver/BalanceResolver.ts

@@ -1,21 +1,19 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
-import Decimal from 'decimal.js-light'
-import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
 import { getCustomRepository } from '@dbTools/typeorm'
-
 import { Transaction as dbTransaction } from '@entity/Transaction'
 import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
-
+import { Decimal } from 'decimal.js-light'
-import { TransactionLinkRepository } from '@repository/TransactionLink'
+import { Resolver, Query, Ctx, Authorized } from 'type-graphql'
 
 import { Balance } from '@model/Balance'
+import { TransactionLinkRepository } from '@repository/TransactionLink'
 
-import { backendLogger as logger } from '@/server/logger'
-import { Context, getUser } from '@/server/context'
-import { calculateDecay } from '@/util/decay'
 import { RIGHTS } from '@/auth/RIGHTS'
-import { GdtResolver } from './GdtResolver'
+import { Context, getUser } from '@/server/context'
+import { backendLogger as logger } from '@/server/logger'
+import { calculateDecay } from '@/util/decay'
 
+import { GdtResolver } from './GdtResolver'
 import { getLastTransaction } from './util/getLastTransaction'
 
 @Resolver()

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

@@ -5,10 +5,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
-import { getCommunities } from '@/seeds/graphql/queries'
 import { Community as DbCommunity } from '@entity/Community'
+
 import { testEnvironment } from '@test/helpers'
 
+import { getCommunities } from '@/seeds/graphql/queries'
+
 let query: any
 
 // to do: We need a setup for the tests that closes the connection

backend/src/graphql/resolver/CommunityResolver.ts

@@ -1,7 +1,7 @@
+import { Community as DbCommunity } from '@entity/Community'
 import { Resolver, Query, Authorized } from 'type-graphql'
 
 import { Community } from '@model/Community'
-import { Community as DbCommunity } from '@entity/Community'
 
 import { RIGHTS } from '@/auth/RIGHTS'
 

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

@@ -4,9 +4,16 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import Decimal from 'decimal.js-light'
+import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
-import { logger } from '@test/testSetup'
+import { Event as DbEvent } from '@entity/Event'
+import { Decimal } from 'decimal.js-light'
 import { GraphQLError } from 'graphql'
+
+import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
+import { logger } from '@test/testSetup'
+
+import { EventType } from '@/event/Event'
+import { userFactory } from '@/seeds/factory/user'
 import {
   login,
   createContributionLink,
@@ -14,13 +21,8 @@ import {
   updateContributionLink,
 } from '@/seeds/graphql/mutations'
 import { listContributionLinks } from '@/seeds/graphql/queries'
-import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { userFactory } from '@/seeds/factory/user'
-import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
-import { EventType } from '@/event/Event'
-import { Event as DbEvent } from '@entity/Event'
 
 let mutate: any, query: any, con: any
 let testEnv: any

backend/src/graphql/resolver/ContributionLinkResolver.ts

@@ -1,6 +1,23 @@
-import Decimal from 'decimal.js-light'
-import { Resolver, Args, Arg, Authorized, Mutation, Query, Int, Ctx } from 'type-graphql'
 import { MoreThan, IsNull } from '@dbTools/typeorm'
+import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
+import { Decimal } from 'decimal.js-light'
+import { Resolver, Args, Arg, Authorized, Mutation, Query, Int, Ctx } from 'type-graphql'
+
+// TODO: this is a strange construct
+import ContributionLinkArgs from '@arg/ContributionLinkArgs'
+import Paginated from '@arg/Paginated'
+import { Order } from '@enum/Order'
+import { ContributionLink } from '@model/ContributionLink'
+import { ContributionLinkList } from '@model/ContributionLinkList'
+
+import { RIGHTS } from '@/auth/RIGHTS'
+import {
+  EVENT_ADMIN_CONTRIBUTION_LINK_CREATE,
+  EVENT_ADMIN_CONTRIBUTION_LINK_DELETE,
+  EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE,
+} from '@/event/Event'
+import { Context, getUser } from '@/server/context'
+import LogError from '@/server/LogError'
 
 import {
   CONTRIBUTIONLINK_NAME_MAX_CHARS,
@@ -8,24 +25,8 @@ import {
   MEMO_MAX_CHARS,
   MEMO_MIN_CHARS,
 } from './const/const'
-import { isStartEndDateValid } from './util/creations'
-import { ContributionLinkList } from '@model/ContributionLinkList'
-import { ContributionLink } from '@model/ContributionLink'
-import ContributionLinkArgs from '@arg/ContributionLinkArgs'
-import { RIGHTS } from '@/auth/RIGHTS'
-import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
-import { Order } from '@enum/Order'
-import Paginated from '@arg/Paginated'
-
-// TODO: this is a strange construct
 import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver'
-import LogError from '@/server/LogError'
+import { isStartEndDateValid } from './util/creations'
-import { Context, getUser } from '@/server/context'
-import {
-  EVENT_ADMIN_CONTRIBUTION_LINK_CREATE,
-  EVENT_ADMIN_CONTRIBUTION_LINK_DELETE,
-  EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE,
-} from '@/event/Event'
 
 @Resolver()
 export class ContributionLinkResolver {

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

@@ -6,9 +6,15 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
+import { Event as DbEvent } from '@entity/Event'
+import { GraphQLError } from 'graphql'
+
 import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
 import { logger, i18n as localization } from '@test/testSetup'
-import { GraphQLError } from 'graphql'
+
+import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
+import { EventType } from '@/event/Event'
+import { userFactory } from '@/seeds/factory/user'
 import {
   adminCreateContributionMessage,
   createContribution,
@@ -16,12 +22,8 @@ import {
   login,
 } from '@/seeds/graphql/mutations'
 import { listContributionMessages } from '@/seeds/graphql/queries'
-import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
-import { EventType } from '@/event/Event'
-import { Event as DbEvent } from '@entity/Event'
 
 jest.mock('@/emails/sendEmailVariants', () => {
   const originalModule = jest.requireActual('@/emails/sendEmailVariants')