Merge branch 'develop' into feature/change-nickname

Author: RitikJaiswal75

.github/workflows/register-commands-production.yaml

@@ -5,7 +5,7 @@ on:
 jobs:
   Register-Commands:
     runs-on: ubuntu-latest
-    environment: staging
+    environment: production
     steps:
       - uses: actions/checkout@v2
       - run: npm install
@@ -28,7 +28,9 @@ jobs:
             DISCORD_PUBLIC_KEY
             DISCORD_TOKEN
             DISCORD_GUILD_ID
+            CURRENT_ENVIRONMENT
         env:
+          CURRENT_ENVIRONMENT: production
           CLOUDFLARE_API_TOKEN: ${{secrets.CLOUDFLARE_API_TOKEN}}
           DISCORD_PUBLIC_KEY: ${{secrets.DISCORD_PUBLIC_KEY}}
           DISCORD_TOKEN: ${{secrets.DISCORD_TOKEN}}

.github/workflows/register-commands-staging.yaml

@@ -28,7 +28,9 @@ jobs:
             DISCORD_PUBLIC_KEY
             DISCORD_TOKEN
             DISCORD_GUILD_ID
+            CURRENT_ENVIRONMENT
         env:
+          CURRENT_ENVIRONMENT: staging
           CLOUDFLARE_API_TOKEN: ${{secrets.CLOUDFLARE_API_TOKEN}}
           DISCORD_PUBLIC_KEY: ${{secrets.DISCORD_PUBLIC_KEY}}
           DISCORD_TOKEN: ${{secrets.DISCORD_TOKEN}}

config/config.ts

@@ -0,0 +1,24 @@
+import { env, environment } from "../src/typeDefinitions/default.types";
+import {
+  RDS_BASE_API_URL,
+  RDS_BASE_STAGING_API_URL,
+  RDS_BASE_DEVELOPMENT_API_URL,
+} from "../src/constants/urls";
+
+const config = (env: env) => {
+  const environment: environment = {
+    production: {
+      RDS_BASE_API_URL: RDS_BASE_API_URL,
+    },
+    staging: {
+      RDS_BASE_API_URL: RDS_BASE_STAGING_API_URL,
+    },
+    default: {
+      RDS_BASE_API_URL: RDS_BASE_DEVELOPMENT_API_URL,
+    },
+  };
+
+  return environment[env.CURRENT_ENVIRONMENT] || environment.default;
+};
+
+export default config;

src/constants/urls.ts

@@ -1,3 +1,6 @@
-export const RDS_API_BASE_URL = "https://api.realdevsquad.com";
+export const RDS_BASE_API_URL = "https://api.realdevsquad.com";
+export const RDS_BASE_STAGING_API_URL = "https://staging-api.realdevsquad.com";
+export const RDS_BASE_DEVELOPMENT_API_URL = "http://localhost:3000"; // If needed, modify the URL to your local API server
+
 export const DISCORD_BASE_URL = "https://discord.com/api/v10";
 export const VERIFICATION_SITE_URL = "https://my.realdevsquad.com";

src/typeDefinitions/default.types.d.ts

@@ -2,6 +2,14 @@ export interface env {
   [key: string]: string;
 }
 
+export interface environment {
+  [key: string]: variables;
+}
+
+export interface variables {
+  RDS_BASE_API_URL: string;
+}
+
 export interface discordCommand {
   name: string;
   description: string;

tests/fixtures/config.ts

@@ -0,0 +1,11 @@
+export const environment = [
+  {
+    CURRENT_ENVIRONMENT: "production",
+  },
+  {
+    CURRENT_ENVIRONMENT: "staging",
+  },
+  {
+    CURRENT_ENVIRONMENT: "",
+  },
+];

tests/unit/config/config.test.ts

@@ -0,0 +1,25 @@
+import config from "../../../config/config";
+import { environment } from "../../fixtures/config";
+import {
+  RDS_BASE_API_URL,
+  RDS_BASE_DEVELOPMENT_API_URL,
+  RDS_BASE_STAGING_API_URL,
+} from "../../../src/constants/urls";
+
+describe("Test config function", () => {
+  it("Should return production config environment", () => {
+    expect(config(environment[0]).RDS_BASE_API_URL).toBe(RDS_BASE_API_URL);
+  });
+
+  it("Should return staging config environment", () => {
+    expect(config(environment[1]).RDS_BASE_API_URL).toBe(
+      RDS_BASE_STAGING_API_URL
+    );
+  });
+
+  it("Should return default config environment", () => {
+    expect(config(environment[2]).RDS_BASE_API_URL).toBe(
+      RDS_BASE_DEVELOPMENT_API_URL
+    );
+  });
+});