sync works

Author: cheesycod

source/database/pool/devs.js

@@ -2,11 +2,8 @@ const Pool = require('pg').Pool
 
 global.pool = new Pool({
     connectionString: process.env.DEVS_PG,
-    connectionTimeoutMillis: 5000,
-    idleTimeoutMillis: 10000,
-    max: 10
 })
 
-global.pool.on('drain', global.pool.end.bind(client));
+global.pool.on('drain', global.pool.end.bind(global.pool));
 
 module.exports = global.pool

source/database/pool/prod.js

@@ -2,12 +2,8 @@ const Pool = require('pg').Pool
 
 global.pool = new Pool({
     connectionString: process.env.PROD_PG,
-    connectionTimeoutMillis: 5000,
-    idleTimeoutMillis: 10000,
-    max: 10
 })
 
-
-global.pool.on('drain', global.pool.end.bind(client));
+global.pool.on('drain', global.pool.end.bind(global.pool));
 
 module.exports = global.pool

source/database/query/guildUser/insert.js

@@ -1,8 +1,23 @@
-module.exports = async ({ userId, userName, cmdBlacklist }) => {
-    const query = {
-        text: 'INSERT INTO enfinityUser(userId, userName, cmdBlacklist) VALUES ($1, $2, $3)',
-        values: [userId, userName, cmdBlacklist]
-    }
+module.exports = async ({ userId, globalName, displayName, cmdBlacklist }) => {
+   const count = await global.pool.query({
+	text: 'SELECT COUNT(*) FROM enfinityUser WHERE userId = $1',
+        values: [userId]
+   })
 
-    await global.pool.query(query)
+   if(count?.rows[0]?.count != 0) {
+	console.log(`EnfinityUser: row found, updating: ${JSON.stringify(count.rows)}`)
+	
+	await global.pool.query({
+		text: 'UPDATE enfinityUser SET globalName = $1, cmd_blacklist = $2 WHERE userId = $3',
+		values: [globalName, cmdBlacklist, userId]
+	})
+
+   } else {
+   	const query = {
+        	text: 'INSERT INTO enfinityUser (userId, globalName, displayName, cmd_blacklist) VALUES ($1, $2, $3, $4)',
+        	values: [userId, globalName, displayName, cmdBlacklist]
+    	}
+
+    	await global.pool.query(query)
+   }
 }

source/database/query/guildUser/select.js

@@ -1,3 +1,12 @@
 module.exports = async ({ userId }) => {
-    await global.pool.query(`SELECT * FROM enfinityUser WHERE userId='${userId}'`)
+    const res = await global.pool.query({
+	text: 'SELECT * FROM enfinityUser WHERE userId = $1',
+	values: [userId],
+    })
+
+    if(res?.rows?.length == 0) {
+	return null
+    }
+
+    return res.rows[0]
 }

source/enfinity/slash/Users/sync.js

@@ -10,7 +10,6 @@ module.exports = {
             userId: enfinity.interaction.user.id
         })
 
-        if (!user) {
             await enfinity.interaction.reply({
                 embeds: [
                     new enfinity.Gateway.EmbedBuilder()
@@ -26,12 +25,13 @@ module.exports = {
                 ]
             })
 
+        if (!user) {
             await enfinity.db.enfinityUser
                 .upsert({
                     userId: `${enfinity.interaction.user.id}`,
                     globalName: `${enfinity.interaction.user.globalName}`,
                     displayName: `${enfinity.interaction.user.displayName}`,
-                    cmd_blacklist: false
+                    cmdBlacklist: false
                 })
                 .then(async () => {
                     await enfinity.interaction.editReply({
@@ -88,7 +88,7 @@ module.exports = {
                         })
                     }, 8000)
                 })
-        } else if (user) {
+        } else {
             await enfinity.interaction.editReply({
                 embeds: [
                     new enfinity.Gateway.EmbedBuilder()
@@ -106,12 +106,13 @@ module.exports = {
 
             await enfinity.db.enfinityUser
                 .upsert({
-                    userId: enfinity.interaction.user.id,
-                    globalName: enfinity.interaction.user.globalName,
-                    displayName: enfinity.interaction.user.displayName,
-                    cmd_blacklist: user.cmd_blacklist
+                    userId: `${enfinity.interaction.user.id}`,
+                    globalName: `${enfinity.interaction.user.globalName}`,
+                    displayName: `${enfinity.interaction.user.displayName}`,
+                    cmdBlacklist: false
                 })
-                .then(async () => {
+
+		.then(async () => {
                     await enfinity.interaction.editReply({
                         embeds: [
                             new enfinity.Gateway.EmbedBuilder()