docker-compose.yml aktualisiert

refactor: Abstract queue generation and configuration

.gitea/workflows/registry.yml

@@ -0,0 +1,52 @@
+name: release-tag
+on:
+  push:
+    branches:
+      - 'main'
+jobs:
+  release-image:
+    runs-on: ubuntu-latest
+    env:
+      DOCKER_ORG: groot
+      DOCKER_LATEST: latest
+      RUNNER_TOOL_CACHE: /toolcache
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+        with: # replace it with your local IP
+          config-inline: |
+            [registry."git.send.nrw"] 
+              http = true
+              insecure = true                        
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          registry: git.send.nrw # replace it with your local IP
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          
+      - name: Get Meta
+        id: meta
+        run: |
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT                          
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: ./docker
+          file: ./docker/Dockerfile.compose
+          entrypoint: ./docker/compose-entrypoint.sh
+          platforms: |
+            linux/amd64                                   
+          push: true
+          tags: | # replace it with your local IP and tags
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
+            git.send.nrw/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}

docker-compose.yml

@@ -1,10 +1,7 @@
 version: '3.9'
 services:
   main:
-    build:
+    image: git.send.nrw/groot/automatisch:latest
-      context: ./docker
-      dockerfile: Dockerfile.compose
-    entrypoint: /compose-entrypoint.sh
     ports:
       - '3000:3000'
     depends_on:
@@ -28,10 +25,7 @@ services:
     volumes:
       - automatisch_storage:/automatisch/storage
   worker:
-    build:
+    image: git.send.nrw/groot/automatisch:latest
-      context: ./docker
-      dockerfile: Dockerfile.compose
-    entrypoint: /compose-entrypoint.sh
     depends_on:
       - main
     environment:

packages/backend/src/queues/action.js

@@ -1,27 +1,4 @@
-import process from 'process';
+import { generateQueue } from './queue.js';
-import { Queue } from 'bullmq';
-import redisConfig from '../config/redis.js';
-import logger from '../helpers/logger.js';
-
-const CONNECTION_REFUSED = 'ECONNREFUSED';
-
-const redisConnection = {
-  connection: redisConfig,
-};
-
-const actionQueue = new Queue('action', redisConnection);
-
-actionQueue.on('error', (error) => {
-  if (error.code === CONNECTION_REFUSED) {
-    logger.error(
-      'Make sure you have installed Redis and it is running.',
-      error
-    );
-
-    process.exit();
-  }
-
-  logger.error('Error happened in action queue!', error);
-});
 
+const actionQueue = generateQueue('action');
 export default actionQueue;

packages/backend/src/queues/delete-user.ee.js

@@ -1,27 +1,4 @@
-import process from 'process';
+import { generateQueue } from './queue.js';
-import { Queue } from 'bullmq';
-import redisConfig from '../config/redis.js';
-import logger from '../helpers/logger.js';
-
-const CONNECTION_REFUSED = 'ECONNREFUSED';
-
-const redisConnection = {
-  connection: redisConfig,
-};
-
-const deleteUserQueue = new Queue('delete-user', redisConnection);
-
-deleteUserQueue.on('error', (error) => {
-  if (error.code === CONNECTION_REFUSED) {
-    logger.error(
-      'Make sure you have installed Redis and it is running.',
-      error
-    );
-
-    process.exit();
-  }
-
-  logger.error('Error happened in delete user queue!', error);
-});
 
+const deleteUserQueue = generateQueue('delete-user');
 export default deleteUserQueue;

packages/backend/src/queues/email.js

@@ -1,27 +1,4 @@
-import process from 'process';
+import { generateQueue } from './queue.js';
-import { Queue } from 'bullmq';
-import redisConfig from '../config/redis.js';
-import logger from '../helpers/logger.js';
-
-const CONNECTION_REFUSED = 'ECONNREFUSED';
-
-const redisConnection = {
-  connection: redisConfig,
-};
-
-const emailQueue = new Queue('email', redisConnection);
-
-emailQueue.on('error', (error) => {
-  if (error.code === CONNECTION_REFUSED) {
-    logger.error(
-      'Make sure you have installed Redis and it is running.',
-      error
-    );
-
-    process.exit();
-  }
-
-  logger.error('Error happened in email queue!', error);
-});
 
+const emailQueue = generateQueue('email');
 export default emailQueue;

packages/backend/src/queues/flow.js

@@ -1,27 +1,4 @@
-import process from 'process';
+import { generateQueue } from './queue.js';
-import { Queue } from 'bullmq';
-import redisConfig from '../config/redis.js';
-import logger from '../helpers/logger.js';
-
-const CONNECTION_REFUSED = 'ECONNREFUSED';
-
-const redisConnection = {
-  connection: redisConfig,
-};
-
-const flowQueue = new Queue('flow', redisConnection);
-
-flowQueue.on('error', (error) => {
-  if (error.code === CONNECTION_REFUSED) {
-    logger.error(
-      'Make sure you have installed Redis and it is running.',
-      error
-    );
-
-    process.exit();
-  }
-
-  logger.error('Error happened in flow queue!', error);
-});
 
+const flowQueue = generateQueue('flow');
 export default flowQueue;

packages/backend/src/queues/queue.js

@@ -0,0 +1,44 @@
+import process from 'process';
+import { Queue } from 'bullmq';
+import redisConfig from '../config/redis.js';
+import logger from '../helpers/logger.js';
+
+const CONNECTION_REFUSED = 'ECONNREFUSED';
+
+const redisConnection = {
+  connection: redisConfig,
+};
+
+export const generateQueue = (queueName, options) => {
+  const queue = new Queue(queueName, redisConnection);
+
+  queue.on('error', (error) => queueOnError(error, queueName));
+
+  if (options?.runDaily) addScheduler(queueName, queue);
+
+  return queue;
+};
+
+const queueOnError = (error, queueName) => {
+  if (error.code === CONNECTION_REFUSED) {
+    const errorMessage =
+      'Make sure you have installed Redis and it is running.';
+
+    logger.error(errorMessage, error);
+
+    process.exit();
+  }
+
+  logger.error(`Error happened in ${queueName} queue!`, error);
+};
+
+const addScheduler = (queueName, queue) => {
+  const everydayAtOneOclock = '0 1 * * *';
+
+  queue.add(queueName, null, {
+    jobId: queueName,
+    repeat: {
+      pattern: everydayAtOneOclock,
+    },
+  });
+};

packages/backend/src/queues/remove-cancelled-subscriptions.ee.js

@@ -1,40 +1,8 @@
-import process from 'process';
+import { generateQueue } from './queue.js';
-import { Queue } from 'bullmq';
-import redisConfig from '../config/redis.js';
-import logger from '../helpers/logger.js';
 
-const CONNECTION_REFUSED = 'ECONNREFUSED';
+const removeCancelledSubscriptionsQueue = generateQueue(
-
-const redisConnection = {
-  connection: redisConfig,
-};
-
-const removeCancelledSubscriptionsQueue = new Queue(
   'remove-cancelled-subscriptions',
-  redisConnection
+  { runDaily: true }
 );
 
-removeCancelledSubscriptionsQueue.on('error', (error) => {
-  if (error.code === CONNECTION_REFUSED) {
-    logger.error(
-      'Make sure you have installed Redis and it is running.',
-      error
-    );
-
-    process.exit();
-  }
-
-  logger.error(
-    'Error happened in remove cancelled subscriptions queue!',
-    error
-  );
-});
-
-removeCancelledSubscriptionsQueue.add('remove-cancelled-subscriptions', null, {
-  jobId: 'remove-cancelled-subscriptions',
-  repeat: {
-    pattern: '0 1 * * *',
-  },
-});
-
 export default removeCancelledSubscriptionsQueue;

packages/backend/src/queues/trigger.js

@@ -1,27 +1,4 @@
-import process from 'process';
+import { generateQueue } from './queue.js';
-import { Queue } from 'bullmq';
-import redisConfig from '../config/redis.js';
-import logger from '../helpers/logger.js';
-
-const CONNECTION_REFUSED = 'ECONNREFUSED';
-
-const redisConnection = {
-  connection: redisConfig,
-};
-
-const triggerQueue = new Queue('trigger', redisConnection);
-
-triggerQueue.on('error', (error) => {
-  if (error.code === CONNECTION_REFUSED) {
-    logger.error(
-      'Make sure you have installed Redis and it is running.',
-      error
-    );
-
-    process.exit();
-  }
-
-  logger.error('Error happened in trigger queue!', error);
-});
 
+const triggerQueue = generateQueue('trigger');
 export default triggerQueue;

packages/e2e-tests/fixtures/admin/delete-role-modal.js

@@ -9,7 +9,6 @@ export class DeleteRoleModal {
     this.modal = page.getByTestId('delete-role-modal');
     this.cancelButton = this.modal.getByTestId('confirmation-cancel-button');
     this.deleteButton = this.modal.getByTestId('confirmation-confirm-button');
-    this.deleteAlert = this.modal.getByTestId('confirmation-dialog-error-alert');
   }
 
   async close () {

packages/e2e-tests/tests/admin/manage-roles.spec.js

@@ -218,7 +218,12 @@ test.describe('Role management page', () => {
         const row = await adminRolesPage.getRoleRowByName('Delete Role');
         const modal = await adminRolesPage.clickDeleteRole(row);
         await modal.deleteButton.click();
-        await expect(modal.deleteAlert).toHaveCount(1);
+        await adminRolesPage.snackbar.waitFor({
+          state: 'attached',
+        });
+        const snackbar = await adminRolesPage.getSnackbarData('snackbar-delete-role-error');
+        await expect(snackbar.variant).toBe('error');
+        await adminRolesPage.closeSnackbar();
         await modal.close();
       }
     );
@@ -313,6 +318,7 @@ test.describe('Role management page', () => {
       const row = await adminUsersPage.findUserPageWithEmail(
         'user-delete-role-test@automatisch.io'
       );
+      // await test.waitForTimeout(10000);
       const modal = await adminUsersPage.clickDeleteUser(row);
       await modal.deleteButton.click();
       await adminUsersPage.snackbar.waitFor({
@@ -329,7 +335,15 @@ test.describe('Role management page', () => {
       const row = await adminRolesPage.getRoleRowByName('Cannot Delete Role');
       const modal = await adminRolesPage.clickDeleteRole(row);
       await modal.deleteButton.click();
-      await expect(modal.deleteAlert).toHaveCount(1);
+      await adminRolesPage.snackbar.waitFor({
+        state: 'attached',
+      });
+      /*
+        * TODO: await snackbar - make assertions based on product
+        * decisions
+        const snackbar = await adminRolesPage.getSnackbarData();
+        await expect(snackbar.variant).toBe('...');
+        */
       await adminRolesPage.closeSnackbar();
     });
   });

packages/web/src/components/ConfirmationDialog/index.jsx

@@ -6,7 +6,6 @@ import DialogActions from '@mui/material/DialogActions';
 import DialogContent from '@mui/material/DialogContent';
 import DialogContentText from '@mui/material/DialogContentText';
 import DialogTitle from '@mui/material/DialogTitle';
-import Alert from '@mui/material/Alert';
 
 function ConfirmationDialog(props) {
   const {
@@ -17,7 +16,6 @@ function ConfirmationDialog(props) {
     cancelButtonChildren,
     confirmButtonChildren,
     open = true,
-    errorMessage,
   } = props;
   const dataTest = props['data-test'];
   return (
@@ -46,11 +44,6 @@ function ConfirmationDialog(props) {
           </Button>
         )}
       </DialogActions>
-      {errorMessage && (
-        <Alert data-test="confirmation-dialog-error-alert" severity="error">
-          {errorMessage}
-        </Alert>
-      )}
     </Dialog>
   );
 }
@@ -64,7 +57,6 @@ ConfirmationDialog.propTypes = {
   confirmButtonChildren: PropTypes.node.isRequired,
   open: PropTypes.bool,
   'data-test': PropTypes.string,
-  errorMessage: PropTypes.string,
 };
 
 export default ConfirmationDialog;

packages/web/src/components/DeleteRoleButton/index.ee.jsx

@@ -4,7 +4,6 @@ import IconButton from '@mui/material/IconButton';
 import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
 import * as React from 'react';
 
-import { getGeneralErrorMessage, getFieldErrorMessage } from 'helpers/errors';
 import Can from 'components/Can';
 import ConfirmationDialog from 'components/ConfirmationDialog';
 import useFormatMessage from 'hooks/useFormatMessage';
@@ -16,21 +15,7 @@ function DeleteRoleButton(props) {
   const formatMessage = useFormatMessage();
   const enqueueSnackbar = useEnqueueSnackbar();
 
-  const {
+  const { mutateAsync: deleteRole } = useAdminDeleteRole(roleId);
-    mutateAsync: deleteRole,
-    error: deleteRoleError,
-    reset: resetDeleteRole,
-  } = useAdminDeleteRole(roleId);
-
-  const roleErrorMessage = getFieldErrorMessage({
-    fieldName: 'role',
-    error: deleteRoleError,
-  });
-
-  const generalErrorMessage = getGeneralErrorMessage({
-    error: deleteRoleError,
-    fallbackMessage: formatMessage('deleteRoleButton.generalError'),
-  });
 
   const handleConfirm = React.useCallback(async () => {
     try {
@@ -43,13 +28,23 @@ function DeleteRoleButton(props) {
           'data-test': 'snackbar-delete-role-success',
         },
       });
-    } catch {}
+    } catch (error) {
-  }, [deleteRole, enqueueSnackbar, formatMessage]);
+      const errors = Object.values(
+        error.response.data.errors || [['Failed while deleting!']],
+      );
 
-  const handleClose = () => {
+      for (const [error] of errors) {
-    setShowConfirmation(false);
+        enqueueSnackbar(error, {
-    resetDeleteRole();
+          variant: 'error',
-  };
+          SnackbarProps: {
+            'data-test': 'snackbar-delete-role-error',
+          },
+        });
+      }
+
+      throw new Error('Failed while deleting!');
+    }
+  }, [deleteRole, enqueueSnackbar, formatMessage]);
 
   return (
     <>
@@ -70,12 +65,11 @@ function DeleteRoleButton(props) {
         open={showConfirmation}
         title={formatMessage('deleteRoleButton.title')}
         description={formatMessage('deleteRoleButton.description')}
-        onClose={handleClose}
+        onClose={() => setShowConfirmation(false)}
         onConfirm={handleConfirm}
         cancelButtonChildren={formatMessage('deleteRoleButton.cancel')}
         confirmButtonChildren={formatMessage('deleteRoleButton.confirm')}
         data-test="delete-role-modal"
-        errorMessage={roleErrorMessage || generalErrorMessage}
       />
     </>
   );

packages/web/src/components/DeleteUserButton/index.ee.jsx

@@ -3,7 +3,6 @@ import DeleteIcon from '@mui/icons-material/Delete';
 import IconButton from '@mui/material/IconButton';
 import { useQueryClient } from '@tanstack/react-query';
 
-import { getGeneralErrorMessage } from 'helpers/errors';
 import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
 import * as React from 'react';
 import ConfirmationDialog from 'components/ConfirmationDialog';
@@ -13,21 +12,12 @@ import useAdminUserDelete from 'hooks/useAdminUserDelete';
 function DeleteUserButton(props) {
   const { userId } = props;
   const [showConfirmation, setShowConfirmation] = React.useState(false);
-  const {
+  const { mutateAsync: deleteUser } = useAdminUserDelete(userId);
-    mutateAsync: deleteUser,
-    error: deleteUserError,
-    reset: resetDeleteUser,
-  } = useAdminUserDelete(userId);
 
   const formatMessage = useFormatMessage();
   const enqueueSnackbar = useEnqueueSnackbar();
   const queryClient = useQueryClient();
 
-  const generalErrorMessage = getGeneralErrorMessage({
-    error: deleteUserError,
-    fallbackMessage: formatMessage('deleteUserButton.deleteError'),
-  });
-
   const handleConfirm = React.useCallback(async () => {
     try {
       await deleteUser();
@@ -39,14 +29,16 @@ function DeleteUserButton(props) {
           'data-test': 'snackbar-delete-user-success',
         },
       });
-    } catch {}
+    } catch (error) {
+      enqueueSnackbar(
+        error?.message || formatMessage('deleteUserButton.deleteError'),
+        {
+          variant: 'error',
+        },
+      );
+    }
   }, [deleteUser]);
 
-  const handleClose = () => {
-    setShowConfirmation(false);
-    resetDeleteUser();
-  };
-
   return (
     <>
       <IconButton
@@ -61,12 +53,11 @@ function DeleteUserButton(props) {
         open={showConfirmation}
         title={formatMessage('deleteUserButton.title')}
         description={formatMessage('deleteUserButton.description')}
-        onClose={handleClose}
+        onClose={() => setShowConfirmation(false)}
         onConfirm={handleConfirm}
         cancelButtonChildren={formatMessage('deleteUserButton.cancel')}
         confirmButtonChildren={formatMessage('deleteUserButton.confirm')}
         data-test="delete-user-modal"
-        errorMessage={generalErrorMessage}
       />
     </>
   );

packages/web/src/helpers/errors.js

@@ -1,29 +0,0 @@
-// Helpers to extract errors received from the API
-
-export const getGeneralErrorMessage = ({ error, fallbackMessage }) => {
-  if (!error) {
-    return;
-  }
-
-  const errors = error?.response?.data?.errors;
-  const generalError = errors?.general;
-
-  if (generalError && Array.isArray(generalError)) {
-    return generalError.join(' ');
-  }
-
-  if (!errors) {
-    return error?.message || fallbackMessage;
-  }
-};
-
-export const getFieldErrorMessage = ({ fieldName, error }) => {
-  const errors = error?.response?.data?.errors;
-  const fieldErrors = errors?.[fieldName];
-
-  if (fieldErrors && Array.isArray(fieldErrors)) {
-    return fieldErrors.join(', ');
-  }
-
-  return '';
-};

packages/web/src/locales/en.json

@@ -245,7 +245,6 @@
   "deleteRoleButton.cancel": "Cancel",
   "deleteRoleButton.confirm": "Delete",
   "deleteRoleButton.successfullyDeleted": "The role has been deleted.",
-  "deleteRoleButton.generalError": "Failed while deleting!",
   "editRolePage.title": "Edit role",
   "createRolePage.title": "Create role",
   "roleForm.name": "Name",