Merge branch 'community_test_db' into apollo_updateBalance

.github/workflows/test.yml

@@ -417,8 +417,6 @@ jobs:
         env:
            MARIADB_ALLOW_EMPTY_PASSWORD: 1
            MARIADB_USER: root
-       # ports: 
-        #  - 3306:3306
         options: --health-cmd="mysqladmin ping"
                  --health-interval=5s
                  --health-timeout=5s
@@ -427,11 +425,14 @@ jobs:
       - name: get mariadb container id
         run: echo "::set-output name=id::$(docker container ls | grep mariadb | awk '{ print $1 }')"
         id: mariadb_container
-      - name: show networks
-        run: echo "$(docker network ls)"
       - name: get automatic created network
         run: echo "::set-output name=id::$(docker network ls | grep github_network | awk '{ print $1 }')"
         id: network
+      - name: Start database migration
+        run: docker run --network ${{ steps.network.outputs.id }} --name=database -d gradido/database:production_up --env NODE_ENV=production --env DB_HOST=mariadb --target production_up
+      - name: get database migration container id
+        run: echo "::set-output name=id::$(docker container ls | grep database | awk '{ print $1 }')"
+        id: database_container
       - name: Start Login-Server
         run: docker run --network ${{ steps.network.outputs.id }} --name=login-server -d gradido/login_server:with-config
       - name: get login-server container id
@@ -452,12 +453,13 @@ jobs:
           path: /tmp
       - name: Load Docker Image
         run: docker load < /tmp/community_server.tar
-        
       # for debugging login-server
       - name: check login-server
         run: docker logs ${{ steps.login_server_container.outputs.id }}
       - name: check mariadb
         run: docker logs ${{ steps.mariadb_container.outputs.id }}
+      - name: check migration
+        run: docker logs ${{ steps.database_container.outputs.id }}
       ##########################################################################
       # UNIT TESTS BACKEND COMMUNITY-SERVER  #######################################
       ##########################################################################

database/src/prepare.ts

@@ -25,6 +25,12 @@ export default async (): Promise<void> => {
       DEFAULT CHARACTER SET utf8mb4
       DEFAULT COLLATE utf8mb4_unicode_ci;`)
 
+  // Create Database `gradido_community_test` for tests
+  await con.query(`
+    CREATE DATABASE IF NOT EXISTS ${CONFIG.DB_DATABASE}_test 
+      DEFAULT CHARACTER SET utf8mb4
+      DEFAULT COLLATE utf8mb4_unicode_ci;`)
+
   // Check if old migration table is present, delete if needed
   const [rows] = await con.query(`SHOW TABLES FROM \`${CONFIG.DB_DATABASE}\` LIKE 'migrations';`)
   if ((<RowDataPacket>rows).length > 0) {

frontend/src/views/Pages/UserProfile/UserCard_Language.vue

@@ -23,13 +23,13 @@
             <b>{{ $t('language') }}</b>
           </small>
         </b-col>
-        <b-col class="col-12">{{ $store.state.language }}</b-col>
+        <b-col class="col-12">{{ $t(buildTagFromLanguageString()) }}</b-col>
       </b-row>
     </div>
 
     <div v-else>
       <div>
-        <b-form @submit.stop.prevent="handleSubmit(onSubmit)">
+        <b-form @submit.stop.prevent="onSubmit">
           <b-row class="mb-2">
             <b-col class="col-12">
               <small>
@@ -93,16 +93,22 @@ export default {
         .query({
           query: updateUserInfos,
           variables: {
-            language: this.$store.state.language,
+            email: this.$store.state.email,
+            locale: this.language,
           },
         })
         .then(() => {
+          this.$store.commit('language', this.language)
           this.cancelEdit()
         })
         .catch((error) => {
           this.$toasted.error(error.message)
         })
     },
+
+    buildTagFromLanguageString() {
+      return 'languages.' + this.$store.state.language
+    },
   },
 }
 </script>