Merge pull request #377 from cap-md089/r-a303931/simplify-dev-setup

simplify dev setup
cap-md089 · Oct 8, 2023 · a479ee2 · a479ee2
2 parents bf57f09 + de8144b
commit a479ee2
Show file tree

Hide file tree

Showing 18 changed files with 1,264 additions and 1,938 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,38 @@
+{
+	"name": "Node.js & TypeScript",
+	"image": "mcr.microsoft.com/devcontainers/typescript-node:1-20-bullseye",
+	"features": {
+		"ghcr.io/devcontainers/features/docker-in-docker:2": {
+			"moby": true,
+			"azureDnsAutoDetection": true,
+			"installDockerBuildx": true,
+			"version": "20.10",
+			"dockerDashComposeVersion": "v2"
+		},
+		"ghcr.io/devcontainers-contrib/features/lerna-npm:1": {
+			"version": "latest"
+		},
+		"ghcr.io/devcontainers-contrib/features/prettier:1" : {
+			"version": "latest"
+		}
+	},
+
+	"forwardPorts": [
+		3000,
+		3001
+	],
+
+	"postCreateCommand": "docker-compose -f docker-compose.dev.yml run dev-setup",
+
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"esbenp.prettier-vscode",
+				"dbaeumer.vscode-eslint"
+			]
+		}
+	}
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -27,6 +27,8 @@ jobs:
 
       - name: Build code
         run: |
+          echo -n em > keys/db_user
+          echo -n toor > keys/db_password
           docker-compose -f docker-compose.dev.yml run --entrypoint='/bin/bash -c "lerna bootstrap && lerna run build --ignore client"' dev-setup
           echo "REACT_APP_HOST_NAME=events.md.cap.gov" >> packages/client/.env
           echo "REACT_APP_RECAPTCHA_KEY={{ secrets.RECAPTCHA_PUBLIC_KEY }}" >> packages/client/.env

diff --git a/Dockerfile.mysqlsh b/Dockerfile.mysqlsh
@@ -1,4 +1,4 @@
-FROM debian
+FROM debian:11
 
 WORKDIR /usr/evm-plus
 

diff --git a/README.md b/README.md
@@ -22,8 +22,9 @@ Current units running the Event Manager suite:
 
 **Table Of Contents**
 
-1. [Requirements for building and running](#requirements-for-building-and-running)
-2. [Server configuration](#server-configuration)
+1. [Developing EvMPlus v6](#developing-evmplus-v6)
+2. [Requirements for building and running](#requirements-for-building-and-running)
+3. [Server configuration](#server-configuration)
     1. [MySQL setup](#mysql-setup)
     2. [AWS SMTP credentials](#aws-smtp-setup)
     3. [AWS DNS credentials](#aws-dns-setup)
@@ -32,12 +33,15 @@ Current units running the Event Manager suite:
     6. [CAPWATCH credentials](#capwatch-setup)
     7. [reCAPTCHA keys](#recaptcha-setup)
     8. [Client setup](#client-setup)
-3. [Using Command Line Utilities](#using-command-line-utilities)
-4. [Building and running the server](#building-and-running-the-server)
+4. [Using Command Line Utilities](#using-command-line-utilities)
+5. [Building and running the server](#building-and-running-the-server)
     1. [Creating an account and supplying it data](#creating-an-account-and-supplying-it-data)
     2. [Accessing the site](#accessing-the-site)
-5. [Alternatively...](#alternatively)
-6. [Developing EvMPlus.org](#developing-evmplus.org)
+6. [Alternatively...](#alternatively)
+
+## Developing EvMPlus v6
+
+Development setup is now much simpler. To get a development environment, open this repository in either Visual Studio Code's dev containers extension or using a GitHub codespaces, wait for the environment to set itself up, and then in a terminal run `docker-compose -f docker-compose.dev.yml run --service-ports client_dev_server`. A development web server will spin up with a basic default dataset and an admin user with the credentials `testadmin`/`testpassword`.
 
 ## Requirements for building and running
 

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -74,7 +74,7 @@ services:
             - MYSQL_DATABASE=EventManagementv6
             - MYSQL_USER_FILE=/run/secrets/db_user
             - MYSQL_PASSWORD_FILE=/run/secrets/db_password
-            - MYSQL_RANDOM_ROOT_PASSWORD=yes
+            - MYSQL_ROOT_PASSWORD=toor
         volumes:
             - type: bind
               source: ./mysql-init
@@ -93,7 +93,32 @@ services:
             target: development-builder
         volumes:
             - .:/usr/evm-plus
-        command: sh -c 'git config core.hooksPath hooks && lerna bootstrap && lerna run build --ignore client'
+        working_dir: /usr/evm-plus
+        depends_on:
+            - mysql
+        environment:
+            - DB_SCHEMA=EventManagementv6
+            - DB_HOST=mysql
+            - DB_PORT=33060
+            - DB_POOL_SIZE=5
+            - CLIENT_PATH=/usr/evm-plus/packages/client
+            - DRIVE_STORAGE_PATH=/srv/uploads
+            - GOOGLE_KEYS_PATH=/google-keys
+            - PORT=3001
+            - HOST_NAME=localevmplus.org
+            - NODE_ENV=development
+        secrets:
+            - db_user
+            - db_password
+        command: /usr/evm-plus/scripts/dev-setup.sh
+
+    full-build:
+        build:
+            context: .
+            target: development-builder
+        volumes:
+            - .:/usr/evm-plus
+        command: lerna run build --ignore client
 
     build-watch:
         build:
@@ -138,8 +163,6 @@ services:
         environment:
             - DB_SCHEMA=EventManagementv6
             - DB_HOST=mysql
-        secrets:
-            - mysql_root_password
         tty: true
         stdin_open: true
         depends_on:

diff --git a/mysql-init/10-setup-user-permissions.sql b/mysql-init/10-setup-user-permissions.sql
@@ -1,3 +1,3 @@
-GRANT ALL PRIVILEGES ON EventManagementv6.* TO 'em'@'main';
-GRANT ALL PRIVILEGES ON EventManagementv6.* TO 'em'@'mysqlsh';
-GRANT ALL PRIVILEGES ON EventManagementv6.* TO 'em'@'capwatch_update';
+/* GRANT ALL PRIVILEGES ON EventManagementv6.* TO 'em'@'main'; */
+/* GRANT ALL PRIVILEGES ON EventManagementv6.* TO 'em'@'mysqlsh'; */
+/* GRANT ALL PRIVILEGES ON EventManagementv6.* TO 'em'@'capwatch_update'; */
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/server-common/src/ImportCAPWATCHFile.ts b/packages/server-common/src/ImportCAPWATCHFile.ts
@@ -53,6 +53,34 @@ import { getRequestFreeTeamsBackend, TeamsBackend } from './Team';
 
 export { CAPWATCHImportErrors as CAPWATCHError };
 
+export const importModules = {
+	cadetAchv,
+	cadetAchvAprs,
+	cadetActivities,
+	cadetDutyPosition,
+	cadetHFZInformationParse,
+	cadetAchievementEnumParse,
+	commanders,
+	dutyPosition,
+	mbrAchievements,
+	mbrContact,
+	memberParse,
+	oFlight,
+	organization,
+	orgContact,
+	seniorAwards,
+	seniorLevel,
+	pl: {
+		groups: plGroups,
+		lookup: plLookup,
+		memberPathCredit: plMemberPathCredit,
+		memberTaskCredit: plMemberTaskCredit,
+		paths: plPaths,
+		taskGroupAssignments: plTaskGroupAssignments,
+		tasks: plTasks
+	}
+};
+
 export type FileData<T> = {
 	[P in keyof T]: string;
 };

diff --git a/packages/server-common/src/index.ts b/packages/server-common/src/index.ts
@@ -63,7 +63,7 @@ export {
 	getRootFileObjectForUser,
 } from './File';
 export * from './GoogleUtils';
-export { default as ImportCAPWATCHFile } from './ImportCAPWATCHFile';
+export { default as ImportCAPWATCHFile, importModules as capwatchImportModules } from './ImportCAPWATCHFile';
 export * as PAM from './member/pam';
 export {
 	CAP,

diff --git a/packages/server-common/src/member/pam/Account.ts b/packages/server-common/src/member/pam/Account.ts
@@ -137,7 +137,7 @@ export const addUserAccountCreationToken = (
 		})
 		.map(() => promisify(randomBytes)(48))
 		.map(token => token.toString('hex'))
-		.tap(token => console.log('Got token', token))
+		.tap(token => console.log('User account creation token:', token))
 		.tap(token =>
 			asyncRight(
 				{

diff --git a/packages/server-common/src/member/pam/index.ts b/packages/server-common/src/member/pam/index.ts
@@ -88,6 +88,17 @@ export {
 	SigninResult,
 	SigninSuccess,
 } from './Auth';
+export {
+	DEFAULT_PASSWORD_ITERATION_COUNT,
+	DEFAULT_PASSWORD_STORED_LENGTH,
+	DEFAULT_SALT_SIZE,
+	PASSWORD_HISTORY_LENGTH,
+	PASSWORD_MAX_AGE,
+	PASSWORD_MIN_AGE,
+	PASSWORD_NEW_ALGORITHM,
+	PASSWORD_RESET_TOKEN_EXPIRE_TIME,
+	hashPassword
+} from './Password';
 // export * from './Password';
 export {
 	BasicMaybeMemberRequest,

diff --git a/packages/server-jest-config/src/index.ts b/packages/server-jest-config/src/index.ts
@@ -362,6 +362,16 @@ export const addPresetRecords = (schema: Schema) => async (map: PresetRecords):
 	await Promise.all(promises);
 };
 
+export const setPresetRecordsSchema = (records: PresetRecords) => async (schema: Schema): Promise<void> => {
+	await Promise.all(
+		COLLECTIONS_USED.map(name =>
+			schema.getCollection(name).remove('true').execute(),
+		),
+	);
+
+	await addPresetRecords(schema)(records);
+};
+
 /**
  * Adds all of the records specified by the PresetRecords map, where each field
  * represents a table and the array values are added to that table

diff --git a/packages/server-jest-config/test-data/CAPWATCH_Test_Data.json b/packages/server-jest-config/test-data/CAPWATCH_Test_Data.json
@@ -12,7 +12,7 @@
 			"Profession": "REL",
 			"EducationLevel": "0",
 			"Citizen": "US Citizen",
-			"ORGID": 9001,
+			"ORGID": 916,
 			"Wing": "VW",
 			"Unit": "1",
 			"Rank": "Lt Col",
@@ -42,7 +42,7 @@
 			"Profession": "Maintenance Management Systems",
 			"EducationLevel": "12",
 			"Citizen": "US Citizen",
-			"ORGID": 9001,
+			"ORGID": 916,
 			"Wing": "VW",
 			"Unit": "1",
 			"Rank": "Lt Col",

diff --git a/packages/util-cli/package.json b/packages/util-cli/package.json
@@ -12,6 +12,7 @@
 	"author": "Andrew Rioux",
 	"license": "GPL-2.0",
 	"dependencies": {
+		"@faker-js/faker": "^8.1.0",
 		"@mysql/xdevapi": "8.0.19",
 		"auto-client-api": "^1.3.23",
 		"common-lib": "^1.28.0",