Merge branch 'develop' into feat-image-links

* develop:
  fix: fix error when updating Telegram ID for an existing phone number (#1178)
  chore: upgrade React; use new JSX transform; sort imports (#1129)
  fix(backend): docker build and tsc output directory structure (#1177)
  feat: refactor msg template components; add telegram character limit (#1148)
  refactor: use shared function to initialize models (#1172)
  chore: setup scaffolding for backend tests (#940)
  1.23.0
  fix(frontend): fix frontend test flakiness (#1162)
  fix: update successful delivery status only if error does not exist (#1150)
  chore: upgrade dependencies (#1153)

.secrets.baseline

@@ -4,7 +4,7 @@
     "files": "package-lock.json|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2020-10-19T02:55:47Z",
+  "generated_at": "2021-04-09T07:48:36Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -55,10 +55,17 @@
     }
   ],
   "results": {
+    "backend/src/test-utils/test-env.ts": [
+      {
+        "hashed_secret": "c237a19676ad55d8904be354990dd54f92f9572c",
+        "is_verified": false,
+        "line_number": 4,
+        "type": "Base64 High Entropy String"
+      }
+    ],
     "frontend/.env-example": [
       {
         "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4",
-        "is_secret": false,
         "is_verified": false,
         "line_number": 5,
         "type": "Basic Auth Credentials"

.travis.yml

@@ -4,6 +4,8 @@ node_js:
 
 services:
   - docker
+  - postgresql
+  - redis-server
 
 cache: npm
 

amplify.yml

@@ -29,7 +29,6 @@ frontend:
     build:
       commands:
         - npm run build
-        - CI=true npm run test
         - npm run upload-source-map
   artifacts:
     # IMPORTANT - Please verify your build output directory

backend/.eslintrc.js

@@ -1,13 +1,14 @@
 module.exports = {
   root: false,
   parser: '@typescript-eslint/parser',
-  plugins: ['@typescript-eslint'],
+  plugins: ['@typescript-eslint', "jest"],
   extends: [
     'eslint:recommended', // Recommended ESLint rules
     'plugin:@typescript-eslint/eslint-recommended', // Disables rules from `eslint:recommended` that are already covered by the TypeScript typechecker
     'plugin:@typescript-eslint/recommended', // Recommended TypeScript rules
     'prettier/@typescript-eslint', // Disables rules from `@typescript-eslint/recommended` that are covered by Prettier
     'plugin:prettier/recommended', // Recommended Prettier rules
+    "plugin:jest/recommended" // Recommended Jest rules
   ],
   parserOptions: {
     sourceType: 'module',

backend/Dockerfile

@@ -19,6 +19,7 @@ RUN npm ci
 
 COPY src ./src
 COPY tsconfig.json ./
+COPY tsconfig.build.json ./
 
 RUN npm run build
 RUN npm prune --production

backend/jest.config.js

@@ -1,14 +1,20 @@
 module.exports = {
   roots: ['<rootDir>'],
-  testMatch: ['**/__tests__/**/*.(spec|test).+(ts|tsx|js)'],
+  testMatch: ['**/tests/**/*.(spec|test).+(ts|tsx|js)'],
+  testPathIgnorePatterns: ['<rootDir>/build/', '<rootDir>/node_modules/'],
   moduleNameMapper: {
     '@core/(.*)': '<rootDir>/src/core/$1',
     '@sms/(.*)': '<rootDir>/src/sms/$1',
     '@email/(.*)': '<rootDir>/src/email/$1',
+    '@telegram/(.*)': '<rootDir>/src/telegram/$1',
+    '@test-utils/(.*)': '<rootDir>/src/test-utils/$1',
   },
   transform: {
     '^.+\\.(ts|tsx)$': 'ts-jest',
   },
   testEnvironment: 'node',
-  setupFilesAfterEnv: ['<rootDir>/__tests__/setup.js'],
+  globalSetup: '<rootDir>/src/test-utils/global-setup.ts',
+  globalTeardown: '<rootDir>/src/test-utils/global-teardown.ts',
+  setupFiles: ['<rootDir>/src/test-utils/test-env.ts'],
+  setupFilesAfterEnv: ['<rootDir>/src/test-utils/setup.ts'],
 }