remove microservices

Author: dderg

.github/workflows/build-and-deploy.yml

@@ -10,18 +10,17 @@ on:
 
 env:
   REGISTRY: "ghcr.io/zero-plus-x"
-  BACKEND_IMAGE_NAME: "helpua-backend"
-  BOT_IMAGE_NAME: "helpua-bot"
+  IMAGE_NAME: "helpua-backend"
 
 jobs:
-  build_and_push_backend:
+  build_and_push:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repo 
         uses: actions/checkout@v2
 
       - name: Build container image
-        run: docker build -t $(echo $REGISTRY)/$(echo $BACKEND_IMAGE_NAME):$(echo $GITHUB_SHA | head -c7) -f packages/backend/Dockerfile .
+        run: docker build -t $(echo $REGISTRY)/$(echo $IMAGE_NAME):$(echo $GITHUB_SHA | head -c7) -f packages/backend/Dockerfile .
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
@@ -31,48 +30,29 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Push image to GitHub Container Registry
-        run: docker push $(echo $REGISTRY)/$(echo $BACKEND_IMAGE_NAME):$(echo $GITHUB_SHA | head -c7)
-
-  build_and_push_bot:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the repo 
-        uses: actions/checkout@v2
-
-      - name: Build container image
-        run: docker build -t $(echo $REGISTRY)/$(echo $BOT_IMAGE_NAME):$(echo $GITHUB_SHA | head -c7) -f packages/bot/Dockerfile .
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Push image to GitHub Container Registry
-        run: docker push $(echo $REGISTRY)/$(echo $BOT_IMAGE_NAME):$(echo $GITHUB_SHA | head -c7)
+        run: docker push $(echo $REGISTRY)/$(echo $IMAGE_NAME):$(echo $GITHUB_SHA | head -c7)
 
   migrate_postgresql:
     runs-on: ubuntu-latest
-    needs: build_and_push_backend
+    needs: build_and_push
     steps:
       - name: Migrate the DB
         uses: appleboy/[email protected]
         with:
           host: ${{ secrets.HOST }}
           username: ${{ secrets.USERNAME }}
           key: ${{ secrets.SSH_KEY }}
-          envs: BACKEND_IMAGE_NAME,REGISTRY,GITHUB_SHA
+          envs: IMAGE_NAME,REGISTRY,GITHUB_SHA
           script: |
             echo ${{ secrets.GITHUB_TOKEN }} | docker login -u ${{ github.actor }} --password-stdin ghcr.io
             docker run \
             --env DATABASE_URL=${{ secrets.DATABASE_URL }} \
-            --name $(echo $BACKEND_IMAGE_NAME)-migrate \
-            $(echo $REGISTRY)/$(echo $BACKEND_IMAGE_NAME):$(echo $GITHUB_SHA | head -c7) \
+            --name $(echo $IMAGE_NAME)-migrate \
+            $(echo $REGISTRY)/$(echo $IMAGE_NAME):$(echo $GITHUB_SHA | head -c7) \
             pnpm migrate:deploy
-            docker rm $(echo $BACKEND_IMAGE_NAME)-migrate
+            docker rm $(echo $IMAGE_NAME)-migrate
 
-  deploy_backend:
+  deploy:
     runs-on: ubuntu-latest
     needs: migrate_postgresql
 
@@ -83,50 +63,24 @@ jobs:
           host: ${{ secrets.HOST }}
           username: ${{ secrets.USERNAME }}
           key: ${{ secrets.SSH_KEY }}
-          envs: BACKEND_IMAGE_NAME,REGISTRY,GITHUB_SHA
-          script: |
-            echo ${{ secrets.GITHUB_TOKEN }} | docker login -u ${{ github.actor }} --password-stdin ghcr.io
-            # Stop running container
-            docker stop $(echo $BACKEND_IMAGE_NAME)
-            # Remove old container
-            docker rm $(echo $BACKEND_IMAGE_NAME)
-            # Run a new container from a new image
-            docker run -d \
-            --env DATABASE_URL=${{ secrets.DATABASE_URL }} \
-            --network net \
-            --restart always \
-            --name $(echo $BACKEND_IMAGE_NAME) \
-            $(echo $REGISTRY)/$(echo $BACKEND_IMAGE_NAME):$(echo $GITHUB_SHA | head -c7)
-
-  deploy_bot:
-    runs-on: ubuntu-latest
-    needs: [build_and_push_bot, deploy_backend]
-
-    steps:
-      - name: Deploy to Digital Ocean droplet via SSH action
-        uses: appleboy/[email protected]
-        with:
-          host: ${{ secrets.HOST }}
-          username: ${{ secrets.USERNAME }}
-          key: ${{ secrets.SSH_KEY }}
-          envs: BOT_IMAGE_NAME,REGISTRY,GITHUB_SHA,BACKEND_IMAGE_NAME
+          envs: IMAGE_NAME,REGISTRY,GITHUB_SHA
           script: |
             echo ${{ secrets.GITHUB_TOKEN }} | docker login -u ${{ github.actor }} --password-stdin ghcr.io
             # Stop running container
-            docker stop $(echo $BOT_IMAGE_NAME)
+            docker stop $(echo $IMAGE_NAME)
             # Remove old container
-            docker rm $(echo $BOT_IMAGE_NAME)
+            docker rm $(echo $IMAGE_NAME)
             # Run a new container from a new image
             docker run -d \
             --env TELEGRAM_BOT_TOKEN=${{ secrets.TELEGRAM_BOT_TOKEN }} \
-            --env BACKEND_HOST=http://$(echo $BACKEND_IMAGE_NAME):3000 \
+            --env DATABASE_URL=${{ secrets.DATABASE_URL }} \
             --network net \
             --restart always \
-            --name $(echo $BOT_IMAGE_NAME) \
-            $(echo $REGISTRY)/$(echo $BOT_IMAGE_NAME):$(echo $GITHUB_SHA | head -c7)
+            --name $(echo $IMAGE_NAME) \
+            $(echo $REGISTRY)/$(echo $IMAGE_NAME):$(echo $GITHUB_SHA | head -c7)
   cleanup:
     runs-on: ubuntu-latest
-    needs: [deploy_bot, deploy_backend]
+    needs: [deploy]
 
     steps:
       - name: Remove unused images

docker-compose.yml

@@ -39,16 +39,3 @@ services:
     environment:
       - DATABASE_URL=postgresql://postgres:postgres@postgres/dev
     command: pnpm dev:backend
-  bot:
-    build:
-      context: .
-      dockerfile: packages/bot/dev.Dockerfile
-    volumes:
-      - ./packages/bot/src:/home/node/app/packages/bot/src
-    ports:
-      - 8080:8080
-    links:
-      - backend
-    env_file:
-      - packages/bot/.env
-    command: pnpm dev:bot

package.json

@@ -5,8 +5,6 @@
   "main": "index.js",
   "private": true,
   "scripts": {
-    "start:bot": "pnpm --filter=@help-ua/bot start",
-    "dev:bot": "node-dev packages/bot/src/index.ts",
     "start:backend": "pnpm --filter=@help-ua/backend start",
     "dev:backend": "node-dev packages/backend/src/index.ts",
     "lint": "eslint '**/*.ts' --max-warnings 0",
@@ -32,8 +30,7 @@
     "typescript": "^4.6.2"
   },
   "devDependencies": {
-    "@types/node": "^17.0.21",
-    "ts-node": "^10.7.0"
+    "@types/node": "^17.0.21"
   },
   "prettier": {
     "singleQuote": true,

packages/backend/package.json

@@ -22,7 +22,9 @@
   "dependencies": {
     "@prisma/client": "^3.10.0",
     "dotenv": "^16.0.0",
-    "express": "^4.17.3",
+    "debug": "^4.3.3",
+    "telegraf": "^4.7.0",
+    "telegraf-session-local": "^2.1.0",
     "prisma": "^3.10.0"
   },
   "devDependencies": {

packages/backend/prisma/schema.prisma

@@ -23,11 +23,6 @@ enum SpokenLanguage {
   GERMAN
 }
 
-enum Role {
-  HELPEE
-  HELPER
-}
-
 enum Category {
   URGENT_CARE
   TRANSPORTATION

packages/backend/sample.env

@@ -1 +1,2 @@
 DATABASE_URL=postgresql://postgres:postgres@localhost/dev
+TELEGRAM_BOT_TOKEN=

packages/bot/src/answers/index.ts renamed to packages/backend/src/bot/answers/index.ts

@@ -2,6 +2,7 @@ import { Telegraf } from 'telegraf';
 import { HelpUAContext, Selection } from '../shared/types';
 import { askForCategory, askForRole, askToRestart } from '../questions';
 import { register } from '../db';
+import {isUILanguage} from '../../translations';
 
 const initialSelection: Selection = {
   uiLanguage: null,
@@ -25,7 +26,7 @@ const initAnswerListeners = (bot: Telegraf<HelpUAContext>) => {
 
     const uiLanguage = ctx.match[1];
 
-    if (uiLanguage != null) {
+    if (uiLanguage != null && isUILanguage(uiLanguage)) {
       ctx.session.selection = withInitialSession({ selection: ctx.session.selection, options: { uiLanguage } });
       const userId = ctx.update.callback_query.from.id
 
@@ -47,9 +48,9 @@ const initAnswerListeners = (bot: Telegraf<HelpUAContext>) => {
     const uiLanguage = ctx.session.selection.uiLanguage;
     const role = ctx.match[1];
 
-    if (role && uiLanguage != null && ctx.session.selection) {
+    if (role && uiLanguage != null && ctx.session.selection && isUILanguage(uiLanguage)) {
       ctx.session.selection.role = role;
-      askForCategory(bot, ctx.chat.id, uiLanguage, role);
+      askForCategory(bot, ctx.chat.id, uiLanguage);
     } else {
       askToRestart(ctx);
     }

packages/backend/src/bot/db/index.ts

@@ -0,0 +1,44 @@
+import { UILanguage } from '@prisma/client';
+import { Answer, User } from '../shared/types';
+import { prisma } from '../../db'
+import { CategoryTranslations, RoleTranslations, UILanguageLabels } from '../../translations';
+
+export const register = async ({ userId, chatId, uiLanguage}: { userId: number, chatId: number, uiLanguage: UILanguage }): Promise<User> => {
+  try {
+    // @NOTE: Dev only, this removes the user before storing to db, so it's easier to test locally
+    // @TODO: Remove later
+    await prisma.user.delete({ where: { telegramUserId: userId } });
+  } catch (e) {
+    console.log('First time user.');
+  }
+
+  const user = await prisma.user.create({
+    data: { chatId, telegramUserId: userId, uiLanguage }
+  });
+
+  return user
+};
+
+export const getUILanguages = (): Answer[] => {
+  return Object.entries(UILanguageLabels).map(([key, label]) => {
+    return {key, label}
+  })
+};
+
+export const getRoles = (uiLanguage: UILanguage): Answer[] => {
+  return Object.entries(RoleTranslations).map(([key, labels]) => {
+    return {
+      key,
+      label: labels[uiLanguage]
+    }
+  })
+};
+
+export const getCategories = (uiLanguage: UILanguage): Answer[] => {
+  return Object.entries(CategoryTranslations).map(([key, labels]) => {
+    return {
+      key,
+      label: labels[uiLanguage]
+    }
+  })
+};

packages/bot/src/questions/index.ts renamed to packages/backend/src/bot/questions/index.ts

@@ -1,9 +1,10 @@
+import {UILanguage} from '@prisma/client';
 import { Telegraf } from 'telegraf';
 import { getCategories, getRoles, getUILanguages } from '../db';
-import { THelpUAContext } from '../shared/types';
+import { HelpUAContext } from '../shared/types';
 
-export const askForLanguage = async (bot: Telegraf<THelpUAContext>, chatId: number) => {
-  const uiLanguages = await getUILanguages();
+export const askForLanguage = async (bot: Telegraf<HelpUAContext>, chatId: number) => {
+  const uiLanguages = getUILanguages();
   const rows = uiLanguages.map(({ key, label }) => ({
     text: label,
     callback_data: `ui-language:${key}`
@@ -16,8 +17,8 @@ export const askForLanguage = async (bot: Telegraf<THelpUAContext>, chatId: numb
   });
 };
 
-export const askForRole = async (bot: Telegraf<THelpUAContext>, chatId: number, uiLanguage: string) => {
-  const roles = await getRoles(uiLanguage);
+export const askForRole = async (bot: Telegraf<HelpUAContext>, chatId: number, uiLanguage: UILanguage) => {
+  const roles = getRoles(uiLanguage);
   const rows = roles.map(role => ({
     text: role.label,
     callback_data: `role:${role.key}`
@@ -30,12 +31,11 @@ export const askForRole = async (bot: Telegraf<THelpUAContext>, chatId: number,
 };
 
 export const askForCategory = async (
-  bot: Telegraf<THelpUAContext>,
+  bot: Telegraf<HelpUAContext>,
   chatId: number,
-  uiLanguage: string,
-  role: string
+  uiLanguage: UILanguage,
 ) => {
-  const categories = await getCategories(uiLanguage, role);
+  const categories = getCategories(uiLanguage);
   const rows = categories.map(category => ({
     text: category.label,
     callback_data: `help-type:${category.key}`
@@ -47,6 +47,6 @@ export const askForCategory = async (
   });
 };
 
-export const askToRestart = (ctx: THelpUAContext) => {
+export const askToRestart = (ctx: HelpUAContext) => {
   ctx.reply('Cannot process response, try /start again');
 };