Use proper DB URL

SocialGouv · Jan 11, 2022 · e8c554f · e8c554f
1 parent e6e1742
commit e8c554f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/.env.development b/.env.development
@@ -1,5 +1,5 @@
 NEXT_TELEMETRY_DISABLED=1
-POSTGRESQL_URL=postgres://monpsysante:monpsysante@localhost:5432/monpsysante
+DATABASE_URL=postgres://monpsysante:monpsysante@localhost:5432/monpsysante
 DB_LOGGING_ENABLE=true
 
 DEMARCHES_SIMPLIFIEES_TOKEN=api-token

diff --git a/.env.staging b/.env.staging
@@ -1,5 +1,5 @@
 NEXT_TELEMETRY_DISABLED=1
-POSTGRESQL_URL=postgres://monpsysante:monpsysante@localhost:5432/monpsysante
+DATABASE_URL=postgres://monpsysante:monpsysante@localhost:5432/monpsysante
 DB_LOGGING_ENABLE=true
 
 

diff --git a/src/components/Directory.tsx b/src/components/Directory.tsx
@@ -46,7 +46,6 @@ const Directory = () => {
   const [psychologists, setPsychologists] = useState<Psychologist[]>();
   const [currentPage, setCurrentPage] = useState(1);
   useEffect(() => {
-    console.log(process.env.NEXT_PUBLIC_DISPLAY_DIRECTORY);
     if (process.env.NEXT_PUBLIC_DISPLAY_DIRECTORY !== "true") {
       router.push("/");
     } else {

diff --git a/src/db/config/config.js b/src/db/config/config.js
@@ -4,12 +4,10 @@ dotenv.config();
 module.exports = {
   development: {
     dialect: "postgres",
-    url: process.env.POSTGRESQL_URL,
+    url: process.env.DATABASE_URL,
   },
   production: {
-    dialect: process.env.POSTGRES_DB_DIALECT,
-    logging: true,
-    operatorsAliases: 0,
-    url: process.env.SCALINGO_POSTGRESQL_URL,
+    dialect: "postgres",
+    url: process.env.DATABASE_URL,
   },
 };
diff --git a/src/services/config.ts b/src/services/config.ts
@@ -1,9 +1,9 @@
-const parseBoolean = (value: string) => value === "true";
+import * as dotenv from "dotenv";
+
+dotenv.config();
+
+const parseBoolean = (value: string | undefined) => value === "true";
 
-console.log(
-  process.env.NEXT_PUBLIC_DISPLAY_DIRECTORY,
-  process.env.NEXT_PUBLIC_DISPLAY_DIRECTORY === "true"
-);
 export default {
   demarchesSimplifiees: {
     apiToken: process.env.DEMARCHES_SIMPLIFIEES_TOKEN,
@@ -15,6 +15,6 @@ export default {
   minScoreAddress: parseFloat(process.env.MIN_SCORE_ADDRESS || "0.55"),
   postgre: {
     logging: parseBoolean(process.env.DB_LOGGING_ENABLE),
-    url: process.env.POSTGRESQL_URL,
+    url: process.env.DATABASE_URL || "",
   },
 };