Merge branch 'master' into 2473-feature-emails-further-design-of-html-emails

admin/package.json

@@ -33,6 +33,7 @@
     "bootstrap": "4.3.1",
     "bootstrap-vue": "^2.21.2",
     "core-js": "^3.6.5",
+    "date-fns": "^2.29.3",
     "dotenv-webpack": "^7.0.3",
     "express": "^4.17.1",
     "graphql": "^15.6.1",

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,39 +154,75 @@ describe('ChangeUserRoleFormular', () => {
               rolesToSelect.at(1).setSelected()
             })
 
-            it('calls the API', () => {
+            it('has "change_user_role" button enabled', () => {
-              expect(apolloMutateMock).toBeCalledWith(
+              expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
-                expect.objectContaining({
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
-                  mutation: setUserRole,
+                false,
-                  variables: {
-                    userId: 1,
-                    isAdmin: true,
-                  },
-                }),
               )
             })
 
-            it('emits "updateIsAdmin"', () => {
+            describe('clicking the "change_user_role" button', () => {
-              expect(wrapper.emitted('updateIsAdmin')).toEqual(
+              beforeEach(async () => {
-                expect.arrayContaining([
+                spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
-                  expect.arrayContaining([
+                spy.mockImplementation(() => Promise.resolve(true))
-                    {
+                await wrapper.find('button').trigger('click')
-                      userId: 1,
+                await wrapper.vm.$nextTick()
-                      isAdmin: expect.any(Date),
+              })
-                    },
-                  ]),
-                ]),
-              )
-            })
 
-            it('toasts success message', () => {
+              it('calls the modal', () => {
-              expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+                expect(wrapper.emitted('showModal'))
+                expect(spy).toHaveBeenCalled()
+              })
+
+              describe('confirm role change with success', () => {
+                it('calls the API', () => {
+                  expect(apolloMutateMock).toBeCalledWith(
+                    expect.objectContaining({
+                      mutation: setUserRole,
+                      variables: {
+                        userId: 1,
+                        isAdmin: true,
+                      },
+                    }),
+                  )
+                })
+
+                it('emits "updateIsAdmin"', () => {
+                  expect(wrapper.emitted('updateIsAdmin')).toEqual(
+                    expect.arrayContaining([
+                      expect.arrayContaining([
+                        {
+                          userId: 1,
+                          isAdmin: expect.any(Date),
+                        },
+                      ]),
+                    ]),
+                  )
+                })
+
+                it('toasts success message', () => {
+                  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,33 +260,69 @@ describe('ChangeUserRoleFormular', () => {
               rolesToSelect.at(0).setSelected()
             })
 
-            it('calls the API', () => {
+            it('has "change_user_role" button enabled', () => {
-              expect(apolloMutateMock).toBeCalledWith(
+              expect(wrapper.find('button.btn.btn-danger').exists()).toBe(true)
-                expect.objectContaining({
+              expect(wrapper.find('button.btn.btn-danger[disabled="disabled"]').exists()).toBe(
-                  mutation: setUserRole,
+                false,
-                  variables: {
-                    userId: 1,
-                    isAdmin: false,
-                  },
-                }),
               )
             })
 
-            it('emits "updateIsAdmin"', () => {
+            describe('clicking the "change_user_role" button', () => {
-              expect(wrapper.emitted('updateIsAdmin')).toEqual(
+              beforeEach(async () => {
-                expect.arrayContaining([
+                spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
-                  expect.arrayContaining([
+                spy.mockImplementation(() => Promise.resolve(true))
-                    {
+                await wrapper.find('button').trigger('click')
-                      userId: 1,
+                await wrapper.vm.$nextTick()
-                      isAdmin: null,
+              })
-                    },
-                  ]),
-                ]),
-              )
-            })
 
-            it('toasts success message', () => {
+              it('calls the modal', () => {
-              expect(toastSuccessSpy).toBeCalledWith('userRole.successfullyChangedTo')
+                expect(wrapper.emitted('showModal'))
+                expect(spy).toHaveBeenCalled()
+              })
+
+              describe('confirm role change with success', () => {
+                it('calls the API', () => {
+                  expect(apolloMutateMock).toBeCalledWith(
+                    expect.objectContaining({
+                      mutation: setUserRole,
+                      variables: {
+                        userId: 1,
+                        isAdmin: false,
+                      },
+                    }),
+                  )
+                })
+
+                it('emits "updateIsAdmin"', () => {
+                  expect(wrapper.emitted('updateIsAdmin')).toEqual(
+                    expect.arrayContaining([
+                      expect.arrayContaining([
+                        {
+                          userId: 1,
+                          isAdmin: null,
+                        },
+                      ]),
+                    ]),
+                  )
+                })
+
+                it('toasts success message', () => {
+                  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/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', () => {
+        expect(wrapper.find('button').text()).toBe('delete_user')
+      })
+
+      describe('click on "delete_user" button', () => {
         beforeEach(async () => {
-          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('showDeleteModal'))
-        })
+          expect(spy).toHaveBeenCalled()
-
-        it('has the button text "delete_user"', () => {
-          expect(wrapper.find('button').text()).toBe('delete_user')
         })
 
         describe('confirm delete with success', () => {
-          beforeEach(async () => {
-            await wrapper.find('button').trigger('click')
-          })
-
           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/Fedaration/FederationVisualizeItem.spec.js

@@ -0,0 +1,183 @@
+import { mount } from '@vue/test-utils'
+import FederationVisualizeItem from './FederationVisualizeItem.vue'
+
+const localVue = global.localVue
+const today = new Date()
+const createdDate = new Date()
+createdDate.setDate(createdDate.getDate() - 3)
+
+let propsData = {
+  item: {
+    id: 7590,
+    foreign: false,
+    publicKey: 'eaf6a426b24fd54f8fbae11c17700fc595080ca25159579c63d38dbc64284ba7',
+    url: 'http://localhost/api/2_0',
+    lastAnnouncedAt: createdDate,
+    verifiedAt: today,
+    lastErrorAt: null,
+    createdAt: createdDate,
+    updatedAt: null,
+  },
+}
+
+const mocks = {
+  $i18n: {
+    locale: 'en',
+  },
+}
+
+describe('FederationVisualizeItem', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(FederationVisualizeItem, { localVue, mocks, propsData })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the component', () => {
+      expect(wrapper.find('div.federation-visualize-item').exists()).toBe(true)
+    })
+
+    describe('rendering item properties', () => {
+      it('has the url', () => {
+        expect(wrapper.find('.row > div:nth-child(2) > div').text()).toBe(
+          'http://localhost/api/2_0',
+        )
+      })
+
+      it('has the public key', () => {
+        expect(wrapper.find('.row > div:nth-child(2) > small').text()).toContain(
+          'eaf6a426b24fd54f8fbae11c17700fc595080ca25159579c63d38dbc64284ba7'.substring(0, 26),
+        )
+      })
+
+      describe('verified item', () => {
+        it('has the check icon', () => {
+          expect(wrapper.find('svg.bi-check').exists()).toBe(true)
+        })
+
+        it('has the text variant "success"', () => {
+          expect(wrapper.find('.text-success').exists()).toBe(true)
+        })
+      })
+
+      describe('not verified item', () => {
+        beforeEach(() => {
+          propsData = {
+            item: {
+              id: 7590,
+              foreign: false,
+              publicKey: 'eaf6a426b24fd54f8fbae11c17700fc595080ca25159579c63d38dbc64284ba7',
+              url: 'http://localhost/api/2_0',
+              lastAnnouncedAt: createdDate,
+              verifiedAt: null,
+              lastErrorAt: null,
+              createdAt: createdDate,
+              updatedAt: null,
+            },
+          }
+          wrapper = Wrapper()
+        })
+
+        it('has the x-circle icon', () => {
+          expect(wrapper.find('svg.bi-x-circle').exists()).toBe(true)
+        })
+
+        it('has the text variant "danger"', () => {
+          expect(wrapper.find('.text-danger').exists()).toBe(true)
+        })
+      })
+
+      // describe('with different locales (de, en, fr, es, nl)', () => {
+      describe('lastAnnouncedAt', () => {
+        it('computes the time string for different locales (de, en, fr, es, nl)', () => {
+          wrapper.vm.$i18n.locale = 'de'
+          wrapper = Wrapper()
+          expect(wrapper.vm.lastAnnouncedAt).toBe('vor 3 Tagen')
+
+          wrapper.vm.$i18n.locale = 'fr'
+          wrapper = Wrapper()
+          expect(wrapper.vm.lastAnnouncedAt).toBe('il y a 3 jours')
+
+          wrapper.vm.$i18n.locale = 'es'
+          wrapper = Wrapper()
+          expect(wrapper.vm.lastAnnouncedAt).toBe('hace 3 días')
+
+          wrapper.vm.$i18n.locale = 'nl'
+          wrapper = Wrapper()
+          expect(wrapper.vm.lastAnnouncedAt).toBe('3 dagen geleden')
+        })
+
+        describe('lastAnnouncedAt == null', () => {
+          beforeEach(() => {
+            propsData = {
+              item: {
+                id: 7590,
+                foreign: false,
+                publicKey: 'eaf6a426b24fd54f8fbae11c17700fc595080ca25159579c63d38dbc64284ba7',
+                url: 'http://localhost/api/2_0',
+                lastAnnouncedAt: null,
+                verifiedAt: null,
+                lastErrorAt: null,
+                createdAt: createdDate,
+                updatedAt: null,
+              },
+            }
+            wrapper = Wrapper()
+          })
+
+          it('computes empty string', async () => {
+            expect(wrapper.vm.lastAnnouncedAt).toBe('')
+          })
+        })
+      })
+
+      describe('createdAt', () => {
+        it('computes the time string for different locales (de, en, fr, es, nl)', () => {
+          wrapper.vm.$i18n.locale = 'de'
+          wrapper = Wrapper()
+          expect(wrapper.vm.createdAt).toBe('vor 3 Tagen')
+
+          wrapper.vm.$i18n.locale = 'fr'
+          wrapper = Wrapper()
+          expect(wrapper.vm.createdAt).toBe('il y a 3 jours')
+
+          wrapper.vm.$i18n.locale = 'es'
+          wrapper = Wrapper()
+          expect(wrapper.vm.createdAt).toBe('hace 3 días')
+
+          wrapper.vm.$i18n.locale = 'nl'
+          wrapper = Wrapper()
+          expect(wrapper.vm.createdAt).toBe('3 dagen geleden')
+        })
+
+        describe('createdAt == null', () => {
+          beforeEach(() => {
+            propsData = {
+              item: {
+                id: 7590,
+                foreign: false,
+                publicKey: 'eaf6a426b24fd54f8fbae11c17700fc595080ca25159579c63d38dbc64284ba7',
+                url: 'http://localhost/api/2_0',
+                lastAnnouncedAt: createdDate,
+                verifiedAt: null,
+                lastErrorAt: null,
+                createdAt: null,
+                updatedAt: null,
+              },
+            }
+            wrapper = Wrapper()
+          })
+
+          it('computes empty string', async () => {
+            expect(wrapper.vm.createdAt).toBe('')
+          })
+        })
+      })
+    })
+  })
+})

admin/src/components/Fedaration/FederationVisualizeItem.vue

@@ -0,0 +1,63 @@
+<template>
+  <div class="federation-visualize-item">
+    <b-row>
+      <b-col cols="1"><b-icon :icon="icon" :variant="variant" class="mr-4"></b-icon></b-col>
+      <b-col>
+        <div>{{ item.url }}</div>
+        <small>{{ `${item.publicKey.substring(0, 26)}…` }}</small>
+      </b-col>
+      <b-col cols="2">{{ lastAnnouncedAt }}</b-col>
+      <b-col cols="2">{{ createdAt }}</b-col>
+    </b-row>
+  </div>
+</template>
+<script>
+import { formatDistanceToNow } from 'date-fns'
+import { de, en, fr, es, nl } from 'date-fns/locale'
+
+const locales = { en, de, es, fr, nl }
+
+export default {
+  name: 'FederationVisualizeItem',
+  props: {
+    item: { type: Object },
+  },
+  data() {
+    return {
+      formatDistanceToNow,
+      locale: this.$i18n.locale,
+    }
+  },
+  computed: {
+    verified() {
+      return new Date(this.item.verifiedAt) >= new Date(this.item.lastAnnouncedAt)
+    },
+    icon() {
+      return this.verified ? 'check' : 'x-circle'
+    },
+    variant() {
+      return this.verified ? 'success' : 'danger'
+    },
+    lastAnnouncedAt() {
+      if (this.item.lastAnnouncedAt) {
+        return formatDistanceToNow(new Date(this.item.lastAnnouncedAt), {
+          includeSecond: true,
+          addSuffix: true,
+          locale: locales[this.locale],
+        })
+      }
+      return ''
+    },
+    createdAt() {
+      if (this.item.createdAt) {
+        return formatDistanceToNow(new Date(this.item.createdAt), {
+          includeSecond: true,
+          addSuffix: true,
+          locale: locales[this.locale],
+        })
+      }
+      return ''
+    },
+  },
+}
+</script>

admin/src/components/NavBar.spec.js

@@ -62,8 +62,12 @@ describe('NavBar', () => {
       )
     })
 
+    it('has a link to /federation', () => {
+      expect(wrapper.findAll('.nav-item').at(3).find('a').attributes('href')).toBe('/federation')
+    })
+
     it('has a link to /statistic', () => {
-      expect(wrapper.findAll('.nav-item').at(3).find('a').attributes('href')).toBe('/statistic')
+      expect(wrapper.findAll('.nav-item').at(4).find('a').attributes('href')).toBe('/statistic')
     })
   })
 
@@ -72,7 +76,7 @@ describe('NavBar', () => {
     beforeEach(async () => {
       delete window.location
       window.location = ''
-      await wrapper.findAll('.nav-item').at(4).find('a').trigger('click')
+      await wrapper.findAll('.nav-item').at(5).find('a').trigger('click')
     })
 
     afterEach(() => {
@@ -97,7 +101,7 @@ describe('NavBar', () => {
       window.location = {
         assign: windowLocationMock,
       }
-      await wrapper.findAll('.nav-item').at(5).find('a').trigger('click')
+      await wrapper.findAll('.nav-item').at(6).find('a').trigger('click')
     })
 
     afterEach(() => {

admin/src/components/NavBar.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="component-nabvar">
-    <b-navbar toggleable="md" type="dark" variant="success">
+    <b-navbar toggleable="lg" type="dark" class="bg-dark">
       <b-navbar-brand class="mb-2" to="/">
         <img src="img/brand/gradido_logo_w.png" class="navbar-brand-img pl-2" alt="..." />
       </b-navbar-brand>
@@ -19,6 +19,9 @@
           <b-nav-item to="/contribution-links">
             {{ $t('navbar.automaticContributions') }}
           </b-nav-item>
+          <b-nav-item to="/federation">
+            {{ $t('navbar.instances') }}
+          </b-nav-item>
           <b-nav-item to="/statistic">{{ $t('navbar.statistic') }}</b-nav-item>
           <b-nav-item @click="wallet">{{ $t('navbar.my-account') }}</b-nav-item>
           <b-nav-item @click="logout">{{ $t('navbar.logout') }}</b-nav-item>

admin/src/graphql/getCommunities.js

@@ -0,0 +1,17 @@
+import gql from 'graphql-tag'
+
+export const getCommunities = gql`
+  query {
+    getCommunities {
+      id
+      foreign
+      publicKey
+      url
+      lastAnnouncedAt
+      verifiedAt
+      lastErrorAt
+      createdAt
+      updatedAt
+    }
+  }
+`

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",
@@ -67,6 +68,13 @@
   "error": "Fehler",
   "expired": "abgelaufen",
   "e_mail": "E-Mail",
+  "federation": {
+    "createdAt": "Erstellt am",
+    "gradidoInstances": "Gradido Instanzen",
+    "lastAnnouncedAt": "letzte Bekanntgabe",
+    "url": "Url",
+    "verified": "Verifiziert"
+  },
   "firstname": "Vorname",
   "footer": {
     "app_version": "App version {version}",
@@ -104,6 +112,7 @@
   "name": "Name",
   "navbar": {
     "automaticContributions": "Automatische Beiträge",
+    "instances": "Instanzen",
     "logout": "Abmelden",
     "my-account": "Mein Konto",
     "statistic": "Statistik",
@@ -114,6 +123,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 +140,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",
@@ -67,6 +68,13 @@
   "error": "Error",
   "expired": "expired",
   "e_mail": "E-mail",
+  "federation": {
+    "createdAt": "Created At ",
+    "gradidoInstances": "Gradido Instances",
+    "lastAnnouncedAt": "Last Announced",
+    "url": "Url",
+    "verified": "Verified"
+  },
   "firstname": "Firstname",
   "footer": {
     "app_version": "App version {version}",
@@ -104,6 +112,7 @@
   "name": "Name",
   "navbar": {
     "automaticContributions": "Automatic Contributions",
+    "instances": "Instances",
     "logout": "Logout",
     "my-account": "My Account",
     "statistic": "Statistic",
@@ -114,6 +123,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 +140,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/pages/CreationConfirm.spec.js

@@ -39,7 +39,7 @@ const mocks = {
 const defaultData = () => {
   return {
     adminListContributions: {
-      contributionCount: 2,
+      contributionCount: 30,
       contributionList: [
         {
           id: 1,
@@ -407,6 +407,44 @@ describe('CreationConfirm', () => {
               statusFilter: ['IN_PROGRESS', 'PENDING', 'CONFIRMED', 'DENIED', 'DELETED'],
             })
           })
+
+          describe('change pagination', () => {
+            it('has pagination buttons', () => {
+              expect(wrapper.findComponent({ name: 'BPagination' }).exists()).toBe(true)
+            })
+
+            describe('next page', () => {
+              beforeEach(() => {
+                jest.clearAllMocks()
+                wrapper.findComponent({ name: 'BPagination' }).vm.$emit('input', 2)
+              })
+
+              it('calls the API again', () => {
+                expect(adminListContributionsMock).toBeCalledWith({
+                  currentPage: 2,
+                  order: 'DESC',
+                  pageSize: 25,
+                  statusFilter: ['IN_PROGRESS', 'PENDING', 'CONFIRMED', 'DENIED', 'DELETED'],
+                })
+              })
+
+              describe('click tab "open" again', () => {
+                beforeEach(async () => {
+                  jest.clearAllMocks()
+                  await wrapper.find('a[data-test="open"]').trigger('click')
+                })
+
+                it('refetches contributions with proper filter and current page = 1', () => {
+                  expect(adminListContributionsMock).toBeCalledWith({
+                    currentPage: 1,
+                    order: 'DESC',
+                    pageSize: 25,
+                    statusFilter: ['IN_PROGRESS', 'PENDING'],
+                  })
+                })
+              })
+            })
+          })
         })
       })
     })

admin/src/pages/CreationConfirm.vue

@@ -116,6 +116,11 @@ export default {
       pageSize: 25,
     }
   },
+  watch: {
+    tabIndex() {
+      this.currentPage = 1
+    },
+  },
   methods: {
     deleteCreation() {
       this.$apollo

admin/src/pages/FederationVisualize.spec.js

@@ -0,0 +1,125 @@
+import { mount } from '@vue/test-utils'
+import FederationVisualize from './FederationVisualize'
+import VueApollo from 'vue-apollo'
+import { createMockClient } from 'mock-apollo-client'
+import { getCommunities } from '@/graphql/getCommunities'
+import { toastErrorSpy } from '../../test/testSetup'
+
+const mockClient = createMockClient()
+const apolloProvider = new VueApollo({
+  defaultClient: mockClient,
+})
+
+const localVue = global.localVue
+
+localVue.use(VueApollo)
+
+const mocks = {
+  $t: (key) => key,
+  $d: jest.fn((d) => d),
+  $i18n: {
+    locale: 'en',
+    t: (key) => key,
+  },
+}
+
+const defaultData = () => {
+  return {
+    getCommunities: [
+      {
+        id: 1776,
+        foreign: true,
+        publicKey: 'c7ca9e742421bb167b8666cb78f90b40c665b8f35db8f001988d44dbb3ce8527',
+        url: 'http://localhost/api/2_0',
+        lastAnnouncedAt: '2023-04-07T12:27:24.037Z',
+        verifiedAt: null,
+        lastErrorAt: null,
+        createdAt: '2023-04-07T11:45:06.254Z',
+        updatedAt: null,
+        __typename: 'Community',
+      },
+      {
+        id: 1775,
+        foreign: true,
+        publicKey: 'c7ca9e742421bb167b8666cb78f90b40c665b8f35db8f001988d44dbb3ce8527',
+        url: 'http://localhost/api/1_1',
+        lastAnnouncedAt: '2023-04-07T12:27:24.023Z',
+        verifiedAt: null,
+        lastErrorAt: null,
+        createdAt: '2023-04-07T11:45:06.234Z',
+        updatedAt: null,
+        __typename: 'Community',
+      },
+      {
+        id: 1774,
+        foreign: true,
+        publicKey: 'c7ca9e742421bb167b8666cb78f90b40c665b8f35db8f001988d44dbb3ce8527',
+        url: 'http://localhost/api/1_0',
+        lastAnnouncedAt: '2023-04-07T12:27:24.009Z',
+        verifiedAt: null,
+        lastErrorAt: null,
+        createdAt: '2023-04-07T11:45:06.218Z',
+        updatedAt: null,
+        __typename: 'Community',
+      },
+    ],
+  }
+}
+
+describe('FederationVisualize', () => {
+  let wrapper
+  const getCommunitiesMock = jest.fn()
+
+  mockClient.setRequestHandler(
+    getCommunities,
+    getCommunitiesMock
+      .mockRejectedValueOnce({ message: 'Ouch!' })
+      .mockResolvedValue({ data: defaultData() }),
+  )
+
+  const Wrapper = () => {
+    return mount(FederationVisualize, { localVue, mocks, apolloProvider })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      jest.clearAllMocks()
+      wrapper = Wrapper()
+    })
+
+    describe('server error', () => {
+      it('toast error', () => {
+        expect(toastErrorSpy).toBeCalledWith('Ouch!')
+      })
+    })
+
+    describe('sever success', () => {
+      it('sends query to Apollo when created', () => {
+        expect(getCommunitiesMock).toBeCalled()
+      })
+
+      it('has a DIV element with the class "federation-visualize"', () => {
+        expect(wrapper.find('div.federation-visualize').exists()).toBe(true)
+      })
+
+      it('has a refresh button', () => {
+        expect(wrapper.find('[data-test="federation-communities-refresh-btn"]').exists()).toBe(true)
+      })
+
+      it('renders 3 community list items', () => {
+        expect(wrapper.findAll('.list-group-item').length).toBe(3)
+      })
+
+      describe('cklicking the refresh button', () => {
+        beforeEach(async () => {
+          jest.clearAllMocks()
+          await wrapper.find('[data-test="federation-communities-refresh-btn"]').trigger('click')
+        })
+
+        it('calls the API', async () => {
+          expect(getCommunitiesMock).toBeCalled()
+        })
+      })
+    })
+  })
+})

admin/src/pages/FederationVisualize.vue

@@ -0,0 +1,69 @@
+<template>
+  <div class="federation-visualize">
+    <div class="d-flex justify-content-between align-items-center mb-3">
+      <span class="h2">{{ $t('federation.gradidoInstances') }}</span>
+      <b-button>
+        <b-icon
+          icon="arrow-clockwise"
+          font-scale="2"
+          :animation="animation"
+          @click="$apollo.queries.GetCommunities.refresh()"
+          data-test="federation-communities-refresh-btn"
+        ></b-icon>
+      </b-button>
+    </div>
+    <b-list-group>
+      <b-row>
+        <b-col cols="1" class="ml-1">{{ $t('federation.verified') }}</b-col>
+        <b-col class="ml-3">{{ $t('federation.url') }}</b-col>
+        <b-col cols="2">{{ $t('federation.lastAnnouncedAt') }}</b-col>
+        <b-col cols="2">{{ $t('federation.createdAt') }}</b-col>
+      </b-row>
+      <b-list-group-item
+        v-for="item in communities"
+        :key="item.id"
+        :variant="!item.foreign ? 'primary' : 'warning'"
+      >
+        <federation-visualize-item :item="item" />
+      </b-list-group-item>
+    </b-list-group>
+  </div>
+</template>
+<script>
+import { getCommunities } from '@/graphql/getCommunities'
+
+import FederationVisualizeItem from '../components/Fedaration/FederationVisualizeItem.vue'
+
+export default {
+  name: 'FederationVisualize',
+  components: {
+    FederationVisualizeItem,
+  },
+  data() {
+    return {
+      oldPublicKey: '',
+      communities: [],
+      icon: '',
+    }
+  },
+  computed: {
+    animation() {
+      return this.$apollo.queries.GetCommunities.loading ? 'spin' : ''
+    },
+  },
+  apollo: {
+    GetCommunities: {
+      fetchPolicy: 'network-only',
+      query() {
+        return getCommunities
+      },
+      update({ getCommunities }) {
+        this.communities = getCommunities
+      },
+      error({ message }) {
+        this.toastError(message)
+      },
+    },
+  },
+}
+</script>

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({

admin/src/router/router.test.js

@@ -45,7 +45,7 @@ describe('router', () => {
 
     describe('routes', () => {
       it('has nine routes defined', () => {
-        expect(routes).toHaveLength(8)
+        expect(routes).toHaveLength(9)
       })
 
       it('has "/overview" as default', async () => {
@@ -88,6 +88,13 @@ describe('router', () => {
         })
       })
 
+      describe('federation', () => {
+        it('loads the "FederationVisualize" page', async () => {
+          const component = await routes.find((r) => r.path === '/federation').component()
+          expect(component.default.name).toBe('FederationVisualize')
+        })
+      })
+
       describe('not found page', () => {
         it('renders the "NotFound" component', async () => {
           const component = await routes.find((r) => r.path === '*').component()

admin/src/router/routes.js

@@ -31,6 +31,10 @@ const routes = [
     path: '*',
     component: () => import('@/components/NotFoundPage.vue'),
   },
+  {
+    path: '/federation',
+    component: () => import('@/pages/FederationVisualize.vue'),
+  },
 ]
 
 export default routes

admin/yarn.lock

@@ -5038,6 +5038,11 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
+date-fns@^2.29.3:
+  version "2.29.3"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
+  integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"

backend/.eslintrc.js

@@ -5,7 +5,7 @@ module.exports = {
     node: true,
   },
   parser: '@typescript-eslint/parser',
-  plugins: ['prettier', '@typescript-eslint', 'type-graphql', 'jest', 'import'],
+  plugins: ['prettier', '@typescript-eslint', 'type-graphql', 'jest', 'import', 'n'],
   extends: [
     'standard',
     'eslint:recommended',
@@ -18,7 +18,9 @@ module.exports = {
       '@typescript-eslint/parser': ['.ts', '.tsx'],
     },
     'import/resolver': {
-      typescript: true,
+      typescript: {
+        project: ['./tsconfig.json', '**/tsconfig.json'],
+      },
       node: true,
     },
   },
@@ -55,7 +57,7 @@ module.exports = {
     'import/named': 'error',
     'import/namespace': 'error',
     'import/no-absolute-path': 'error',
-    'import/no-cycle': 'off',
+    'import/no-cycle': 'error',
     'import/no-dynamic-require': 'error',
     'import/no-internal-modules': 'off',
     'import/no-relative-packages': 'error',
@@ -71,7 +73,7 @@ module.exports = {
     'import/group-exports': 'off',
     'import/newline-after-import': 'error',
     'import/no-anonymous-default-export': 'error',
-    'import/no-default-export': 'off',
+    'import/no-default-export': 'error',
     'import/no-duplicates': 'error',
     'import/no-named-default': 'error',
     'import/no-namespace': 'error',
@@ -100,7 +102,46 @@ module.exports = {
         distinctGroup: true,
       },
     ],
-    'import/prefer-default-export': 'off', // TODO
+    'import/prefer-default-export': 'off',
+    // n
+    'n/handle-callback-err': 'error',
+    'n/no-callback-literal': 'error',
+    'n/no-exports-assign': 'error',
+    'n/no-extraneous-import': 'error',
+    'n/no-extraneous-require': 'error',
+    'n/no-hide-core-modules': 'error',
+    'n/no-missing-import': 'off', // not compatible with typescript
+    'n/no-missing-require': 'error',
+    'n/no-new-require': 'error',
+    'n/no-path-concat': 'error',
+    'n/no-process-exit': 'error',
+    'n/no-unpublished-bin': 'error',
+    'n/no-unpublished-import': 'off', // TODO need to exclude seeds
+    'n/no-unpublished-require': 'error',
+    'n/no-unsupported-features': ['error', { ignores: ['modules'] }],
+    'n/no-unsupported-features/es-builtins': 'error',
+    'n/no-unsupported-features/es-syntax': 'error',
+    'n/no-unsupported-features/node-builtins': 'error',
+    'n/process-exit-as-throw': 'error',
+    'n/shebang': 'error',
+    'n/callback-return': 'error',
+    'n/exports-style': 'error',
+    'n/file-extension-in-import': 'off',
+    'n/global-require': 'error',
+    'n/no-mixed-requires': 'error',
+    'n/no-process-env': 'error',
+    'n/no-restricted-import': 'error',
+    'n/no-restricted-require': 'error',
+    'n/no-sync': 'error',
+    'n/prefer-global/buffer': 'error',
+    'n/prefer-global/console': 'error',
+    'n/prefer-global/process': 'error',
+    'n/prefer-global/text-decoder': 'error',
+    'n/prefer-global/text-encoder': 'error',
+    'n/prefer-global/url': 'error',
+    'n/prefer-global/url-search-params': 'error',
+    'n/prefer-promises/dns': 'error',
+    'n/prefer-promises/fs': 'error',
   },
   overrides: [
     // only for ts files
@@ -121,8 +162,8 @@ module.exports = {
         'import/unambiguous': 'off',
       },
       parserOptions: {
-        tsconfigRootDir: './',
+        tsconfigRootDir: __dirname,
-        project: ['./tsconfig.json'],
+        project: ['./tsconfig.json', '**/tsconfig.json'],
         // this is to properly reference the referenced project database without requirement of compiling it
         EXPERIMENTAL_useSourceOfProjectReferenceRedirect: true,
       },

backend/jest.config.js

@@ -22,10 +22,12 @@ module.exports = {
     '@repository/(.*)': '<rootDir>/src/typeorm/repository/$1',
     '@test/(.*)': '<rootDir>/test/$1',
     '@entity/(.*)':
+      // eslint-disable-next-line n/no-process-env
       process.env.NODE_ENV === 'development'
         ? '<rootDir>/../database/entity/$1'
         : '<rootDir>/../database/build/entity/$1',
     '@dbTools/(.*)':
+      // eslint-disable-next-line n/no-process-env
       process.env.NODE_ENV === 'development'
         ? '<rootDir>/../database/src/$1'
         : '<rootDir>/../database/build/src/$1',

backend/package.json

@@ -56,25 +56,25 @@
     "@types/node": "^16.10.3",
     "@types/nodemailer": "^6.4.4",
     "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^4.28.0",
+    "@typescript-eslint/eslint-plugin": "^5.57.1",
-    "@typescript-eslint/parser": "^4.28.0",
+    "@typescript-eslint/parser": "^5.57.1",
     "apollo-server-testing": "^2.25.2",
-    "eslint": "^7.29.0",
+    "eslint": "^8.37.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-prettier": "^8.8.0",
-    "eslint-config-standard": "^16.0.3",
+    "eslint-config-standard": "^17.0.0",
-    "eslint-import-resolver-typescript": "^3.5.3",
+    "eslint-import-resolver-typescript": "^3.5.4",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-n": "^15.7.0",
-    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-promise": "^6.1.1",
     "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",
-    "prettier": "^2.3.1",
+    "prettier": "^2.8.7",
     "ts-jest": "^27.0.5",
     "ts-node": "^10.0.0",
     "tsconfig-paths": "^3.14.0",
@@ -84,5 +84,8 @@
     "ignore": [
       "**/*.test.ts"
     ]
+  },
+  "engines": {
+    "node": ">=14"
   }
 }

backend/src/apis/HttpRequest.ts

@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import axios from 'axios'
 
-import LogError from '@/server/LogError'
+import { LogError } from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

backend/src/apis/KlicktippController.ts

@@ -4,7 +4,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import CONFIG from '@/config'
+
+import { CONFIG } from '@/config'
 
 // eslint-disable-next-line import/no-relative-parent-imports
 import KlicktippConnector from 'klicktipp-api'

backend/src/auth/JWT.ts

@@ -1,7 +1,7 @@
 import { verify, sign } from 'jsonwebtoken'
 
-import CONFIG from '@/config/'
+import { CONFIG } from '@/config/'
-import LogError from '@/server/LogError'
+import { LogError } from '@/server/LogError'
 
 import { CustomJwtPayload } from './CustomJwtPayload'
 

backend/src/auth/RIGHTS.ts

@@ -35,6 +35,7 @@ export enum RIGHTS {
   CREATE_CONTRIBUTION_MESSAGE = 'CREATE_CONTRIBUTION_MESSAGE',
   LIST_ALL_CONTRIBUTION_MESSAGES = 'LIST_ALL_CONTRIBUTION_MESSAGES',
   OPEN_CREATIONS = 'OPEN_CREATIONS',
+  USER = 'USER',
   // Admin
   SEARCH_USERS = 'SEARCH_USERS',
   SET_USER_ROLE = 'SET_USER_ROLE',

backend/src/auth/ROLES.ts

@@ -34,6 +34,7 @@ export const ROLE_USER = new Role('user', [
   RIGHTS.CREATE_CONTRIBUTION_MESSAGE,
   RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES,
   RIGHTS.OPEN_CREATIONS,
+  RIGHTS.USER,
 ])
 export const ROLE_ADMIN = new Role('admin', Object.values(RIGHTS)) // all rights
 

backend/src/config/index.test.ts

@@ -1,4 +1,4 @@
-import CONFIG from './index'
+import { CONFIG } from './index'
 
 describe('config/index', () => {
   describe('decay start block', () => {

backend/src/config/index.ts

@@ -1,4 +1,5 @@
 // ATTENTION: DO NOT PUT ANY SECRETS IN HERE (or the .env)
+/* eslint-disable n/no-process-env */
 
 import { Decimal } from 'decimal.js-light'
 import dotenv from 'dotenv'
@@ -120,7 +121,7 @@ const federation = {
     Number(process.env.FEDERATION_VALIDATE_COMMUNITY_TIMER) || 60000,
 }
 
-const CONFIG = {
+export const CONFIG = {
   ...constants,
   ...server,
   ...database,
@@ -131,5 +132,3 @@ const CONFIG = {
   ...webhook,
   ...federation,
 }
-
-export default CONFIG

backend/src/emails/sendEmailTranslated.test.ts

@@ -4,7 +4,7 @@ import { createTransport } from 'nodemailer'
 
 import { logger, i18n } from '@test/testSetup'
 
-import CONFIG from '@/config'
+import { CONFIG } from '@/config'
 
 import { sendEmailTranslated } from './sendEmailTranslated'
 

backend/src/emails/sendEmailTranslated.ts

@@ -5,8 +5,8 @@ import Email from 'email-templates'
 import i18n from 'i18n'
 import { createTransport } from 'nodemailer'
 
-import CONFIG from '@/config'
+import { CONFIG } from '@/config'
-import LogError from '@/server/LogError'
+import { LogError } from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 
 export const sendEmailTranslated = async (params: {

backend/src/emails/sendEmailVariants.test.ts

@@ -8,7 +8,7 @@ import { Decimal } from 'decimal.js-light'
 import { testEnvironment } from '@test/helpers'
 import { logger, i18n as localization } from '@test/testSetup'
 
-import CONFIG from '@/config'
+import { CONFIG } from '@/config'
 
 import { sendEmailTranslated } from './sendEmailTranslated'
 import {

backend/src/emails/sendEmailVariants.ts

@@ -1,6 +1,6 @@
 import { Decimal } from 'decimal.js-light'
 
-import CONFIG from '@/config'
+import { CONFIG } from '@/config'
 import { decimalSeparatorByLanguage } from '@/util/utilities'
 
 import { sendEmailTranslated } from './sendEmailTranslated'

backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_CONFIRM = async (
   user: DbUser,

backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_CREATE = async (
   user: DbUser,

backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_DELETE = async (
   user: DbUser,

backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_DENY = async (
   user: DbUser,

backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_CREATE = async (
   moderator: DbUser,

backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts

@@ -2,7 +2,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_DELETE = async (
   moderator: DbUser,

backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE = async (
   moderator: DbUser,

backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts

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

backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_ADMIN_CONTRIBUTION_UPDATE = async (
   user: DbUser,

backend/src/event/EVENT_ADMIN_USER_DELETE.ts

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

backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts

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

backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts

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

backend/src/event/EVENT_CONTRIBUTION_CREATE.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_CREATE = async (
   user: DbUser,

backend/src/event/EVENT_CONTRIBUTION_DELETE.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_DELETE = async (
   user: DbUser,

backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts

@@ -5,7 +5,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_LINK_REDEEM = async (
   user: DbUser,

backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts

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

backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_CONTRIBUTION_UPDATE = async (
   user: DbUser,

backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts

@@ -1,7 +1,8 @@
 import { Event as DbEvent } from '@entity/Event'
 import { User as DbUser } from '@entity/User'
 
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.EMAIL_ACCOUNT_MULTIREGISTRATION, user, { id: 0 } as DbUser).save()

backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts

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

backend/src/event/EVENT_EMAIL_CONFIRMATION.ts

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

backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts

@@ -1,7 +1,8 @@
 import { Event as DbEvent } from '@entity/Event'
 import { User as DbUser } from '@entity/User'
 
-import { Event, EventType } from './Event'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_EMAIL_FORGOT_PASSWORD = async (user: DbUser): Promise<DbEvent> =>
   Event(EventType.EMAIL_FORGOT_PASSWORD, user, { id: 0 } as DbUser).save()

backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_LINK_CREATE = async (
   user: DbUser,

backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts

@@ -2,7 +2,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_LINK_DELETE = async (
   user: DbUser,

backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_LINK_REDEEM = async (
   user: DbUser,

backend/src/event/EVENT_TRANSACTION_RECEIVE.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_RECEIVE = async (
   user: DbUser,

backend/src/event/EVENT_TRANSACTION_SEND.ts

@@ -3,7 +3,8 @@ 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'
+import { Event } from './Event'
+import { EventType } from './EventType'
 
 export const EVENT_TRANSACTION_SEND = async (
   user: DbUser,

backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts

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

backend/src/event/EVENT_USER_INFO_UPDATE.ts

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

backend/src/event/EVENT_USER_LOGIN.ts

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

backend/src/event/EVENT_USER_LOGOUT.ts

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

backend/src/event/EVENT_USER_REGISTER.ts

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

backend/src/event/Event.ts

@@ -34,37 +34,3 @@ export const Event = (
   event.amount = amount
   return event
 }
-
-export { EventType }
-
-export { EVENT_ADMIN_CONTRIBUTION_CONFIRM } from './EVENT_ADMIN_CONTRIBUTION_CONFIRM'
-export { EVENT_ADMIN_CONTRIBUTION_CREATE } from './EVENT_ADMIN_CONTRIBUTION_CREATE'
-export { EVENT_ADMIN_CONTRIBUTION_DELETE } from './EVENT_ADMIN_CONTRIBUTION_DELETE'
-export { EVENT_ADMIN_CONTRIBUTION_DENY } from './EVENT_ADMIN_CONTRIBUTION_DENY'
-export { EVENT_ADMIN_CONTRIBUTION_UPDATE } from './EVENT_ADMIN_CONTRIBUTION_UPDATE'
-export { EVENT_ADMIN_CONTRIBUTION_LINK_CREATE } from './EVENT_ADMIN_CONTRIBUTION_LINK_CREATE'
-export { EVENT_ADMIN_CONTRIBUTION_LINK_DELETE } from './EVENT_ADMIN_CONTRIBUTION_LINK_DELETE'
-export { EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE } from './EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE'
-export { EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE'
-export { EVENT_ADMIN_USER_DELETE } from './EVENT_ADMIN_USER_DELETE'
-export { EVENT_ADMIN_USER_UNDELETE } from './EVENT_ADMIN_USER_UNDELETE'
-export { EVENT_ADMIN_USER_ROLE_SET } from './EVENT_ADMIN_USER_ROLE_SET'
-export { EVENT_CONTRIBUTION_CREATE } from './EVENT_CONTRIBUTION_CREATE'
-export { EVENT_CONTRIBUTION_DELETE } from './EVENT_CONTRIBUTION_DELETE'
-export { EVENT_CONTRIBUTION_UPDATE } from './EVENT_CONTRIBUTION_UPDATE'
-export { EVENT_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_CONTRIBUTION_MESSAGE_CREATE'
-export { EVENT_CONTRIBUTION_LINK_REDEEM } from './EVENT_CONTRIBUTION_LINK_REDEEM'
-export { EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION } from './EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION'
-export { EVENT_EMAIL_ADMIN_CONFIRMATION } from './EVENT_EMAIL_ADMIN_CONFIRMATION'
-export { EVENT_EMAIL_CONFIRMATION } from './EVENT_EMAIL_CONFIRMATION'
-export { EVENT_EMAIL_FORGOT_PASSWORD } from './EVENT_EMAIL_FORGOT_PASSWORD'
-export { EVENT_TRANSACTION_SEND } from './EVENT_TRANSACTION_SEND'
-export { EVENT_TRANSACTION_RECEIVE } from './EVENT_TRANSACTION_RECEIVE'
-export { EVENT_TRANSACTION_LINK_CREATE } from './EVENT_TRANSACTION_LINK_CREATE'
-export { EVENT_TRANSACTION_LINK_DELETE } from './EVENT_TRANSACTION_LINK_DELETE'
-export { EVENT_TRANSACTION_LINK_REDEEM } from './EVENT_TRANSACTION_LINK_REDEEM'
-export { EVENT_USER_ACTIVATE_ACCOUNT } from './EVENT_USER_ACTIVATE_ACCOUNT'
-export { EVENT_USER_INFO_UPDATE } from './EVENT_USER_INFO_UPDATE'
-export { EVENT_USER_LOGIN } from './EVENT_USER_LOGIN'
-export { EVENT_USER_LOGOUT } from './EVENT_USER_LOGOUT'
-export { EVENT_USER_REGISTER } from './EVENT_USER_REGISTER'

backend/src/event/Events.ts

@@ -0,0 +1,33 @@
+export { EventType } from './EventType'
+export { Event } from './Event'
+export { EVENT_ADMIN_CONTRIBUTION_CONFIRM } from './EVENT_ADMIN_CONTRIBUTION_CONFIRM'
+export { EVENT_ADMIN_CONTRIBUTION_CREATE } from './EVENT_ADMIN_CONTRIBUTION_CREATE'
+export { EVENT_ADMIN_CONTRIBUTION_DELETE } from './EVENT_ADMIN_CONTRIBUTION_DELETE'
+export { EVENT_ADMIN_CONTRIBUTION_DENY } from './EVENT_ADMIN_CONTRIBUTION_DENY'
+export { EVENT_ADMIN_CONTRIBUTION_UPDATE } from './EVENT_ADMIN_CONTRIBUTION_UPDATE'
+export { EVENT_ADMIN_CONTRIBUTION_LINK_CREATE } from './EVENT_ADMIN_CONTRIBUTION_LINK_CREATE'
+export { EVENT_ADMIN_CONTRIBUTION_LINK_DELETE } from './EVENT_ADMIN_CONTRIBUTION_LINK_DELETE'
+export { EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE } from './EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE'
+export { EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE'
+export { EVENT_ADMIN_USER_DELETE } from './EVENT_ADMIN_USER_DELETE'
+export { EVENT_ADMIN_USER_UNDELETE } from './EVENT_ADMIN_USER_UNDELETE'
+export { EVENT_ADMIN_USER_ROLE_SET } from './EVENT_ADMIN_USER_ROLE_SET'
+export { EVENT_CONTRIBUTION_CREATE } from './EVENT_CONTRIBUTION_CREATE'
+export { EVENT_CONTRIBUTION_DELETE } from './EVENT_CONTRIBUTION_DELETE'
+export { EVENT_CONTRIBUTION_UPDATE } from './EVENT_CONTRIBUTION_UPDATE'
+export { EVENT_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_CONTRIBUTION_MESSAGE_CREATE'
+export { EVENT_CONTRIBUTION_LINK_REDEEM } from './EVENT_CONTRIBUTION_LINK_REDEEM'
+export { EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION } from './EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION'
+export { EVENT_EMAIL_ADMIN_CONFIRMATION } from './EVENT_EMAIL_ADMIN_CONFIRMATION'
+export { EVENT_EMAIL_CONFIRMATION } from './EVENT_EMAIL_CONFIRMATION'
+export { EVENT_EMAIL_FORGOT_PASSWORD } from './EVENT_EMAIL_FORGOT_PASSWORD'
+export { EVENT_TRANSACTION_SEND } from './EVENT_TRANSACTION_SEND'
+export { EVENT_TRANSACTION_RECEIVE } from './EVENT_TRANSACTION_RECEIVE'
+export { EVENT_TRANSACTION_LINK_CREATE } from './EVENT_TRANSACTION_LINK_CREATE'
+export { EVENT_TRANSACTION_LINK_DELETE } from './EVENT_TRANSACTION_LINK_DELETE'
+export { EVENT_TRANSACTION_LINK_REDEEM } from './EVENT_TRANSACTION_LINK_REDEEM'
+export { EVENT_USER_ACTIVATE_ACCOUNT } from './EVENT_USER_ACTIVATE_ACCOUNT'
+export { EVENT_USER_INFO_UPDATE } from './EVENT_USER_INFO_UPDATE'
+export { EVENT_USER_LOGIN } from './EVENT_USER_LOGIN'
+export { EVENT_USER_LOGOUT } from './EVENT_USER_LOGOUT'
+export { EVENT_USER_REGISTER } from './EVENT_USER_REGISTER'

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

@@ -5,7 +5,7 @@ import { Community as DbCommunity } from '@entity/Community'
 import { gql } from 'graphql-request'
 
 import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
-import LogError from '@/server/LogError'
+import { LogError } from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 
 export async function requestGetPublicKey(dbCom: DbCommunity): Promise<string | undefined> {

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

@@ -5,7 +5,7 @@ import { Community as DbCommunity } from '@entity/Community'
 import { gql } from 'graphql-request'
 
 import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient'
-import LogError from '@/server/LogError'
+import { LogError } from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 
 export async function requestGetPublicKey(dbCom: DbCommunity): Promise<string | undefined> {

backend/src/federation/validateCommunities.ts

@@ -1,7 +1,7 @@
 import { IsNull } from '@dbTools/typeorm'
 import { Community as DbCommunity } from '@entity/Community'
 
-import LogError from '@/server/LogError'
+import { LogError } from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 
 // eslint-disable-next-line camelcase

backend/src/graphql/arg/AdminCreateContributionArgs.ts

@@ -3,7 +3,7 @@ import { ArgsType, Field, InputType } from 'type-graphql'
 
 @InputType()
 @ArgsType()
-export default class AdminCreateContributionArgs {
+export class AdminCreateContributionArgs {
   @Field(() => String)
   email: string
 

backend/src/graphql/arg/AdminUpdateContributionArgs.ts

@@ -2,7 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { ArgsType, Field, Int } from 'type-graphql'
 
 @ArgsType()
-export default class AdminUpdateContributionArgs {
+export class AdminUpdateContributionArgs {
   @Field(() => Int)
   id: number
 

backend/src/graphql/arg/ContributionArgs.ts

@@ -3,7 +3,7 @@ import { ArgsType, Field, InputType } from 'type-graphql'
 
 @InputType()
 @ArgsType()
-export default class ContributionArgs {
+export class ContributionArgs {
   @Field(() => Decimal)
   amount: Decimal
 

backend/src/graphql/arg/ContributionLinkArgs.ts

@@ -2,7 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { ArgsType, Field, Int } from 'type-graphql'
 
 @ArgsType()
-export default class ContributionLinkArgs {
+export class ContributionLinkArgs {
   @Field(() => Decimal)
   amount: Decimal
 

backend/src/graphql/arg/ContributionMessageArgs.ts

@@ -2,7 +2,7 @@ import { ArgsType, Field, Int, InputType } from 'type-graphql'
 
 @InputType()
 @ArgsType()
-export default class ContributionMessageArgs {
+export class ContributionMessageArgs {
   @Field(() => Int)
   contributionId: number
 

backend/src/graphql/arg/CreateUserArgs.ts

@@ -1,7 +1,7 @@
 import { ArgsType, Field, Int } from 'type-graphql'
 
 @ArgsType()
-export default class CreateUserArgs {
+export class CreateUserArgs {
   @Field(() => String)
   email: string
 

backend/src/graphql/arg/Paginated.ts

@@ -4,7 +4,7 @@ import { ArgsType, Field, Int } from 'type-graphql'
 import { Order } from '@enum/Order'
 
 @ArgsType()
-export default class Paginated {
+export class Paginated {
   @Field(() => Int, { nullable: true })
   currentPage?: number
 

backend/src/graphql/arg/SearchUsersArgs.ts

@@ -1,9 +1,9 @@
 import { ArgsType, Field, Int } from 'type-graphql'
 
-import SearchUsersFilters from '@arg/SearchUsersFilters'
+import { SearchUsersFilters } from '@arg/SearchUsersFilters'
 
 @ArgsType()
-export default class SearchUsersArgs {
+export class SearchUsersArgs {
   @Field(() => String)
   searchText: string
 

backend/src/graphql/arg/SearchUsersFilters.ts

@@ -1,7 +1,7 @@
 import { Field, InputType } from 'type-graphql'
 
 @InputType()
-export default class SearchUsersFilters {
+export class SearchUsersFilters {
   @Field(() => Boolean, { nullable: true, defaultValue: null })
   byActivated?: boolean | null
 

backend/src/graphql/arg/TransactionLinkArgs.ts

@@ -2,7 +2,7 @@ import { Decimal } from 'decimal.js-light'
 import { ArgsType, Field } from 'type-graphql'
 
 @ArgsType()
-export default class TransactionLinkArgs {
+export class TransactionLinkArgs {
   @Field(() => Decimal)
   amount: Decimal
 

backend/src/graphql/arg/TransactionLinkFilters.ts

@@ -2,7 +2,7 @@
 import { Field, InputType } from 'type-graphql'
 
 @InputType()
-export default class TransactionLinkFilters {
+export class TransactionLinkFilters {
   @Field(() => Boolean, { nullable: true })
   withDeleted?: boolean
 

backend/src/graphql/arg/TransactionSendArgs.ts

@@ -2,9 +2,9 @@ import { Decimal } from 'decimal.js-light'
 import { ArgsType, Field } from 'type-graphql'
 
 @ArgsType()
-export default class TransactionSendArgs {
+export class TransactionSendArgs {
   @Field(() => String)
-  email: string
+  identifier: string
 
   @Field(() => Decimal)
   amount: Decimal

backend/src/graphql/arg/UnsecureLoginArgs.ts

@@ -1,7 +1,7 @@
 import { ArgsType, Field, Int } from 'type-graphql'
 
 @ArgsType()
-export default class UnsecureLoginArgs {
+export class UnsecureLoginArgs {
   @Field(() => String)
   email: string
 

backend/src/graphql/arg/UpdateUserInfosArgs.ts

@@ -1,7 +1,7 @@
 import { ArgsType, Field, Int } from 'type-graphql'
 
 @ArgsType()
-export default class UpdateUserInfosArgs {
+export class UpdateUserInfosArgs {
   @Field({ nullable: true })
   firstName?: string
 

backend/src/graphql/directive/isAuthorized.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 
 import { User } from '@entity/User'
 import { AuthChecker } from 'type-graphql'
@@ -9,9 +10,9 @@ import { INALIENABLE_RIGHTS } from '@/auth/INALIENABLE_RIGHTS'
 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'
+import { LogError } from '@/server/LogError'
 
-const isAuthorized: AuthChecker<any> = async ({ context }, rights) => {
+export const isAuthorized: AuthChecker<any> = async ({ context }, rights) => {
   context.role = ROLE_UNAUTHORIZED // unauthorized user
 
   // is rights an inalienable right?
@@ -55,5 +56,3 @@ const isAuthorized: AuthChecker<any> = async ({ context }, rights) => {
   context.setHeaders.push({ key: 'token', value: encode(decoded.gradidoID) })
   return true
 }
-
-export default isAuthorized

backend/src/graphql/model/Community.ts

@@ -8,9 +8,7 @@ export class Community {
     this.foreign = dbCom.foreign
     this.publicKey = dbCom.publicKey.toString()
     this.url =
-      (dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/') +
+      (dbCom.endPoint.endsWith('/') ? dbCom.endPoint : dbCom.endPoint + '/') + dbCom.apiVersion
-      'api/' +
-      dbCom.apiVersion
     this.lastAnnouncedAt = dbCom.lastAnnouncedAt
     this.verifiedAt = dbCom.verifiedAt
     this.lastErrorAt = dbCom.lastErrorAt

backend/src/graphql/model/ContributionLink.ts

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

backend/src/graphql/model/Transaction.ts

@@ -47,6 +47,10 @@ export class Transaction {
     this.linkId = transaction.contribution
       ? transaction.contribution.contributionLinkId
       : transaction.transactionLinkId || null
+    this.previousBalance =
+      (transaction.previousTransaction &&
+        transaction.previousTransaction.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN)) ||
+      new Decimal(0)
   }
 
   @Field(() => Int)
@@ -70,6 +74,9 @@ export class Transaction {
   @Field(() => Date)
   balanceDate: Date
 
+  @Field(() => Decimal)
+  previousBalance: Decimal
+
   @Field(() => Decay)
   decay: Decay
 

backend/src/graphql/model/TransactionLink.ts

@@ -2,7 +2,7 @@ import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
 import { Decimal } from 'decimal.js-light'
 import { ObjectType, Field, Int } from 'type-graphql'
 
-import CONFIG from '@/config'
+import { CONFIG } from '@/config'
 
 import { User } from './User'
 

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

@@ -36,6 +36,7 @@ describe('CommunityResolver', () => {
     let foreignCom1: DbCommunity
     let foreignCom2: DbCommunity
     let foreignCom3: DbCommunity
+
     describe('with empty list', () => {
       it('returns no community entry', async () => {
         // const result: Community[] = await query({ query: getCommunities })
@@ -56,7 +57,7 @@ describe('CommunityResolver', () => {
         homeCom1.foreign = false
         homeCom1.publicKey = Buffer.from('publicKey-HomeCommunity')
         homeCom1.apiVersion = '1_0'
-        homeCom1.endPoint = 'http://localhost'
+        homeCom1.endPoint = 'http://localhost/api'
         homeCom1.createdAt = new Date()
         await DbCommunity.insert(homeCom1)
 
@@ -64,7 +65,7 @@ describe('CommunityResolver', () => {
         homeCom2.foreign = false
         homeCom2.publicKey = Buffer.from('publicKey-HomeCommunity')
         homeCom2.apiVersion = '1_1'
-        homeCom2.endPoint = 'http://localhost'
+        homeCom2.endPoint = 'http://localhost/api'
         homeCom2.createdAt = new Date()
         await DbCommunity.insert(homeCom2)
 
@@ -72,24 +73,24 @@ describe('CommunityResolver', () => {
         homeCom3.foreign = false
         homeCom3.publicKey = Buffer.from('publicKey-HomeCommunity')
         homeCom3.apiVersion = '2_0'
-        homeCom3.endPoint = 'http://localhost'
+        homeCom3.endPoint = 'http://localhost/api'
         homeCom3.createdAt = new Date()
         await DbCommunity.insert(homeCom3)
       })
 
-      it('returns three home-community entries', async () => {
+      it('returns 3 home-community entries', async () => {
         await expect(query({ query: getCommunities })).resolves.toMatchObject({
           data: {
             getCommunities: [
               {
-                id: 1,
+                id: 3,
-                foreign: homeCom1.foreign,
+                foreign: homeCom3.foreign,
                 publicKey: expect.stringMatching('publicKey-HomeCommunity'),
-                url: expect.stringMatching('http://localhost/api/1_0'),
+                url: expect.stringMatching('http://localhost/api/2_0'),
                 lastAnnouncedAt: null,
                 verifiedAt: null,
                 lastErrorAt: null,
-                createdAt: homeCom1.createdAt.toISOString(),
+                createdAt: homeCom3.createdAt.toISOString(),
                 updatedAt: null,
               },
               {
@@ -104,14 +105,14 @@ describe('CommunityResolver', () => {
                 updatedAt: null,
               },
               {
-                id: 3,
+                id: 1,
-                foreign: homeCom3.foreign,
+                foreign: homeCom1.foreign,
                 publicKey: expect.stringMatching('publicKey-HomeCommunity'),
-                url: expect.stringMatching('http://localhost/api/2_0'),
+                url: expect.stringMatching('http://localhost/api/1_0'),
                 lastAnnouncedAt: null,
                 verifiedAt: null,
                 lastErrorAt: null,
-                createdAt: homeCom3.createdAt.toISOString(),
+                createdAt: homeCom1.createdAt.toISOString(),
                 updatedAt: null,
               },
             ],
@@ -128,7 +129,7 @@ describe('CommunityResolver', () => {
         foreignCom1.foreign = true
         foreignCom1.publicKey = Buffer.from('publicKey-ForeignCommunity')
         foreignCom1.apiVersion = '1_0'
-        foreignCom1.endPoint = 'http://remotehost'
+        foreignCom1.endPoint = 'http://remotehost/api'
         foreignCom1.createdAt = new Date()
         await DbCommunity.insert(foreignCom1)
 
@@ -136,7 +137,7 @@ describe('CommunityResolver', () => {
         foreignCom2.foreign = true
         foreignCom2.publicKey = Buffer.from('publicKey-ForeignCommunity')
         foreignCom2.apiVersion = '1_1'
-        foreignCom2.endPoint = 'http://remotehost'
+        foreignCom2.endPoint = 'http://remotehost/api'
         foreignCom2.createdAt = new Date()
         await DbCommunity.insert(foreignCom2)
 
@@ -144,24 +145,24 @@ describe('CommunityResolver', () => {
         foreignCom3.foreign = true
         foreignCom3.publicKey = Buffer.from('publicKey-ForeignCommunity')
         foreignCom3.apiVersion = '1_2'
-        foreignCom3.endPoint = 'http://remotehost'
+        foreignCom3.endPoint = 'http://remotehost/api'
         foreignCom3.createdAt = new Date()
         await DbCommunity.insert(foreignCom3)
       })
 
-      it('returns 3x home and 3x foreign-community entries', async () => {
+      it('returns 3 home community and 3 foreign community entries', async () => {
         await expect(query({ query: getCommunities })).resolves.toMatchObject({
           data: {
             getCommunities: [
               {
-                id: 1,
+                id: 3,
-                foreign: homeCom1.foreign,
+                foreign: homeCom3.foreign,
                 publicKey: expect.stringMatching('publicKey-HomeCommunity'),
-                url: expect.stringMatching('http://localhost/api/1_0'),
+                url: expect.stringMatching('http://localhost/api/2_0'),
                 lastAnnouncedAt: null,
                 verifiedAt: null,
                 lastErrorAt: null,
-                createdAt: homeCom1.createdAt.toISOString(),
+                createdAt: homeCom3.createdAt.toISOString(),
                 updatedAt: null,
               },
               {
@@ -176,25 +177,25 @@ describe('CommunityResolver', () => {
                 updatedAt: null,
               },
               {
-                id: 3,
+                id: 1,
-                foreign: homeCom3.foreign,
+                foreign: homeCom1.foreign,
                 publicKey: expect.stringMatching('publicKey-HomeCommunity'),
-                url: expect.stringMatching('http://localhost/api/2_0'),
+                url: expect.stringMatching('http://localhost/api/1_0'),
                 lastAnnouncedAt: null,
                 verifiedAt: null,
                 lastErrorAt: null,
-                createdAt: homeCom3.createdAt.toISOString(),
+                createdAt: homeCom1.createdAt.toISOString(),
                 updatedAt: null,
               },
               {
-                id: 4,
+                id: 6,
-                foreign: foreignCom1.foreign,
+                foreign: foreignCom3.foreign,
                 publicKey: expect.stringMatching('publicKey-ForeignCommunity'),
-                url: expect.stringMatching('http://remotehost/api/1_0'),
+                url: expect.stringMatching('http://remotehost/api/1_2'),
                 lastAnnouncedAt: null,
                 verifiedAt: null,
                 lastErrorAt: null,
-                createdAt: foreignCom1.createdAt.toISOString(),
+                createdAt: foreignCom3.createdAt.toISOString(),
                 updatedAt: null,
               },
               {
@@ -209,14 +210,14 @@ describe('CommunityResolver', () => {
                 updatedAt: null,
               },
               {
-                id: 6,
+                id: 4,
-                foreign: foreignCom3.foreign,
+                foreign: foreignCom1.foreign,
                 publicKey: expect.stringMatching('publicKey-ForeignCommunity'),
-                url: expect.stringMatching('http://remotehost/api/1_2'),
+                url: expect.stringMatching('http://remotehost/api/1_0'),
                 lastAnnouncedAt: null,
                 verifiedAt: null,
                 lastErrorAt: null,
-                createdAt: foreignCom3.createdAt.toISOString(),
+                createdAt: foreignCom1.createdAt.toISOString(),
                 updatedAt: null,
               },
             ],

backend/src/graphql/resolver/CommunityResolver.ts

@@ -11,7 +11,11 @@ export class CommunityResolver {
   @Query(() => [Community])
   async getCommunities(): Promise<Community[]> {
     const dbCommunities: DbCommunity[] = await DbCommunity.find({
-      order: { foreign: 'ASC', publicKey: 'ASC', apiVersion: 'ASC' },
+      order: {
+        foreign: 'ASC',
+        createdAt: 'DESC',
+        lastAnnouncedAt: 'DESC',
+      },
     })
     return dbCommunities.map((dbCom: DbCommunity) => new Community(dbCom))
   }

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

@@ -3,6 +3,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 
 import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
 import { Event as DbEvent } from '@entity/Event'
@@ -12,7 +13,7 @@ import { GraphQLError } from 'graphql'
 import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
 import { logger } from '@test/testSetup'
 
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 import { userFactory } from '@/seeds/factory/user'
 import {
   login,

backend/src/graphql/resolver/ContributionLinkResolver.ts

@@ -3,9 +3,8 @@ 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 ContributionLinkArgs from '@arg/ContributionLinkArgs'
+import { Paginated } from '@arg/Paginated'
-import Paginated from '@arg/Paginated'
 import { Order } from '@enum/Order'
 import { ContributionLink } from '@model/ContributionLink'
 import { ContributionLinkList } from '@model/ContributionLinkList'
@@ -15,9 +14,9 @@ import {
   EVENT_ADMIN_CONTRIBUTION_LINK_CREATE,
   EVENT_ADMIN_CONTRIBUTION_LINK_DELETE,
   EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE,
-} from '@/event/Event'
+} from '@/event/Events'
 import { Context, getUser } from '@/server/context'
-import LogError from '@/server/LogError'
+import { LogError } from '@/server/LogError'
 
 import {
   CONTRIBUTIONLINK_NAME_MAX_CHARS,

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

@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Event as DbEvent } from '@entity/Event'
 import { GraphQLError } from 'graphql'
 
@@ -13,7 +13,7 @@ import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
 import { logger, i18n as localization } from '@test/testSetup'
 
 import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 import { userFactory } from '@/seeds/factory/user'
 import {
   adminCreateContributionMessage,

backend/src/graphql/resolver/ContributionMessageResolver.ts

@@ -6,8 +6,8 @@ import { User as DbUser } from '@entity/User'
 import { UserContact as DbUserContact } from '@entity/UserContact'
 import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
 
-import ContributionMessageArgs from '@arg/ContributionMessageArgs'
+import { ContributionMessageArgs } from '@arg/ContributionMessageArgs'
-import Paginated from '@arg/Paginated'
+import { Paginated } from '@arg/Paginated'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { ContributionMessageType } from '@enum/MessageType'
 import { Order } from '@enum/Order'
@@ -18,9 +18,9 @@ import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
 import {
   EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE,
   EVENT_CONTRIBUTION_MESSAGE_CREATE,
-} from '@/event/Event'
+} from '@/event/Events'
 import { Context, getUser } from '@/server/context'
-import LogError from '@/server/LogError'
+import { LogError } from '@/server/LogError'
 
 @Resolver()
 export class ContributionMessageResolver {
@@ -87,7 +87,7 @@ export class ContributionMessageResolver {
       .select('cm')
       .from(DbContributionMessage, 'cm')
       .leftJoinAndSelect('cm.user', 'u')
-      .where({ contributionId: contributionId })
+      .where({ contributionId })
       .orderBy('cm.createdAt', order)
       .limit(pageSize)
       .offset((currentPage - 1) * pageSize)

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

@@ -5,7 +5,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Contribution } from '@entity/Contribution'
 import { Event as DbEvent } from '@entity/Event'
 import { Transaction as DbTransaction } from '@entity/Transaction'
@@ -32,7 +32,7 @@ import {
   sendContributionDeletedEmail,
   sendContributionDeniedEmail,
 } from '@/emails/sendEmailVariants'
-import { EventType } from '@/event/Event'
+import { EventType } from '@/event/Events'
 import { creations } from '@/seeds/creation/index'
 import { creationFactory } from '@/seeds/factory/creation'
 import { userFactory } from '@/seeds/factory/user'

backend/src/graphql/resolver/ContributionResolver.ts

@@ -8,10 +8,10 @@ import { UserContact } from '@entity/UserContact'
 import { Decimal } from 'decimal.js-light'
 import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
 
-import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs'
+import { AdminCreateContributionArgs } from '@arg/AdminCreateContributionArgs'
-import AdminUpdateContributionArgs from '@arg/AdminUpdateContributionArgs'
+import { AdminUpdateContributionArgs } from '@arg/AdminUpdateContributionArgs'
-import ContributionArgs from '@arg/ContributionArgs'
+import { ContributionArgs } from '@arg/ContributionArgs'
-import Paginated from '@arg/Paginated'
+import { Paginated } from '@arg/Paginated'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { ContributionType } from '@enum/ContributionType'
 import { ContributionMessageType } from '@enum/MessageType'
@@ -38,9 +38,9 @@ import {
   EVENT_ADMIN_CONTRIBUTION_DELETE,
   EVENT_ADMIN_CONTRIBUTION_CONFIRM,
   EVENT_ADMIN_CONTRIBUTION_DENY,
-} from '@/event/Event'
+} from '@/event/Events'
 import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
-import LogError from '@/server/LogError'
+import { LogError } from '@/server/LogError'
 import { backendLogger as logger } from '@/server/logger'
 import { calculateDecay } from '@/util/decay'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'

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

@@ -9,7 +9,7 @@ import { GraphQLError } from 'graphql'
 
 import { testEnvironment, cleanDB } from '@test/helpers'
 
-import CONFIG from '@/config'
+import { CONFIG } from '@/config'
 import { createUser, setPassword, forgotPassword } from '@/seeds/graphql/mutations'
 import { queryOptIn } from '@/seeds/graphql/queries'
 

backend/src/graphql/resolver/GdtResolver.ts

@@ -1,17 +1,18 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Resolver, Query, Args, Ctx, Authorized, Arg, Int, Float } from 'type-graphql'
 
-import Paginated from '@arg/Paginated'
+import { Paginated } from '@arg/Paginated'
 import { Order } from '@enum/Order'
 import { GdtEntryList } from '@model/GdtEntryList'
 
 import { apiGet, apiPost } from '@/apis/HttpRequest'
 import { RIGHTS } from '@/auth/RIGHTS'
-import CONFIG from '@/config'
+import { CONFIG } from '@/config'
 import { Context, getUser } from '@/server/context'
-import LogError from '@/server/LogError'
+import { LogError } from '@/server/LogError'
 
 @Resolver()
 export class GdtResolver {

backend/src/graphql/resolver/StatisticsResolver.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { getConnection } from '@dbTools/typeorm'
 import { Transaction as DbTransaction } from '@entity/Transaction'
 import { User as DbUser } from '@entity/User'