From 0e2e1e7a6042be070d61fea14393e58a9337ae2d Mon Sep 17 00:00:00 2001 From: Matthew Lopez <73856503+MatthewL246@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:21:46 -0500 Subject: [PATCH] Update server creation script to stop duplicates --- ...h => create-server-in-database-script.patch} | 17 ++++++++++------- scripts/setup-environment.sh | 2 +- ...se.sh => update-account-servers-database.sh} | 4 +++- 3 files changed, 14 insertions(+), 9 deletions(-) rename patches/account/{create-database-server-script.patch => create-server-in-database-script.patch} (88%) rename scripts/{setup-account-servers-database.sh => update-account-servers-database.sh} (71%) diff --git a/patches/account/create-database-server-script.patch b/patches/account/create-server-in-database-script.patch similarity index 88% rename from patches/account/create-database-server-script.patch rename to patches/account/create-server-in-database-script.patch index c6f3c33..1c62629 100644 --- a/patches/account/create-database-server-script.patch +++ b/patches/account/create-server-in-database-script.patch @@ -1,9 +1,9 @@ -diff --git c/src/create-database-server.ts i/src/create-database-server.ts +diff --git c/src/create-server-in-database.ts i/src/create-server-in-database.ts new file mode 100644 -index 0000000..b8d7727 +index 0000000..5176d41 --- /dev/null -+++ i/src/create-database-server.ts -@@ -0,0 +1,87 @@ ++++ i/src/create-server-in-database.ts +@@ -0,0 +1,90 @@ +/* eslint-disable indent */ +/* eslint-disable quotes */ +import mongoose from "mongoose"; @@ -14,13 +14,16 @@ index 0000000..b8d7727 + const args = process.argv.slice(2); + if (args.length < 1) { + throw new Error( -+ "Not enough arguments.\nUsage: create-database-server " ++ "Not enough arguments.\nUsage: create-database-server " + ); + } + + await connect(); -+ -+ if (args[0] === "nex") { ++ if (args[0] === "reset") { ++ console.log("Deleting all servers..."); ++ await Server.deleteMany({}); ++ console.log("Database reset."); ++ } else if (args[0] === "nex") { + if (args.length !== 8) { + throw new Error( + "Wrong arguments.\nUsage: create-database-server nex " diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 79c6a5c..0093f94 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -71,4 +71,4 @@ echo "Successfully set up environment." # Some things need to be updated with the new environment variables and secrets echo "Running necessary scripts..." "$git_base"/scripts/update-postgres-password.sh -"$git_base"/scripts/setup-account-servers-database.sh +"$git_base"/scripts/update-account-servers-database.sh diff --git a/scripts/setup-account-servers-database.sh b/scripts/update-account-servers-database.sh similarity index 71% rename from scripts/setup-account-servers-database.sh rename to scripts/update-account-servers-database.sh index 3e6f52f..efbff4c 100755 --- a/scripts/setup-account-servers-database.sh +++ b/scripts/update-account-servers-database.sh @@ -8,7 +8,9 @@ git_base=$(git rev-parse --show-toplevel) docker compose up -d account -docker compose exec account node /app/dist/create-database-server.js nex \ +docker compose exec account node /app/dist/create-server-in-database.js reset + +docker compose exec account node /app/dist/create-server-in-database.js nex \ "Friend List" "00003200" "0005001010001C00" "$COMPUTER_IP" \ "$PN_FRIENDS_AUTHENTICATION_SERVER_PORT" "prod" "$PN_FRIENDS_CONFIG_AES_KEY"