added async to methods in api and await in return for async methods

HowProgrammingWorks · Aug 1, 2023 · 2641c0d · 2641c0d
1 parent 3557121
commit 2641c0d
Show file tree

Hide file tree

Showing 16 changed files with 114 additions and 114 deletions.
diff --git a/JavaScript/2-controller/main.js b/JavaScript/2-controller/main.js
@@ -17,27 +17,27 @@ const pool = new pg.Pool({
 
 const routing = {
   user: {
-    get(id) {
+    async get(id) {
       if (!id) return pool.query('SELECT id, login FROM users');
       const sql = 'SELECT id, login FROM users WHERE id = $1';
-      return pool.query(sql, [id]);
+      return await pool.query(sql, [id]);
     },
 
     async post({ login, password }) {
       const sql = 'INSERT INTO users (login, password) VALUES ($1, $2)';
       const passwordHash = await hash(password);
-      return pool.query(sql, [login, passwordHash]);
+      return await pool.query(sql, [login, passwordHash]);
     },
 
     async put(id, { login, password }) {
       const sql = 'UPDATE users SET login = $1, password = $2 WHERE id = $3';
       const passwordHash = await hash(password);
-      return pool.query(sql, [login, passwordHash, id]);
+      return await pool.query(sql, [login, passwordHash, id]);
     },
 
-    delete(id) {
+    async delete(id) {
       const sql = 'DELETE FROM users WHERE id = $1';
-      return pool.query(sql, [id]);
+      return await pool.query(sql, [id]);
     },
   },
 };

diff --git a/JavaScript/3-crud/db.js b/JavaScript/3-crud/db.js
@@ -11,15 +11,15 @@ const pool = new pg.Pool({
 });
 
 module.exports = (table) => ({
-  query(sql, args) {
-    return pool.query(sql, args);
+  async query(sql, args) {
+    return await pool.query(sql, args);
   },
 
-  read(id, fields = ['*']) {
+  async read(id, fields = ['*']) {
     const names = fields.join(', ');
     const sql = `SELECT ${names} FROM ${table}`;
     if (!id) return pool.query(sql);
-    return pool.query(`${sql} WHERE id = $1`, [id]);
+    return await pool.query(`${sql} WHERE id = $1`, [id]);
   },
 
   async create({ ...record }) {
@@ -34,7 +34,7 @@ module.exports = (table) => ({
     const fields = '"' + keys.join('", "') + '"';
     const params = nums.join(', ');
     const sql = `INSERT INTO "${table}" (${fields}) VALUES (${params})`;
-    return pool.query(sql, data);
+    return await pool.query(sql, data);
   },
 
   async update(id, { ...record }) {
@@ -49,11 +49,11 @@ module.exports = (table) => ({
     const delta = updates.join(', ');
     const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`;
     data.push(id);
-    return pool.query(sql, data);
+    return await pool.query(sql, data);
   },
 
-  delete(id) {
+  async delete(id) {
     const sql = `DELETE FROM ${table} WHERE id = $1`;
-    return pool.query(sql, [id]);
+    return await pool.query(sql, [id]);
   },
 });
diff --git a/JavaScript/4-service/db.js b/JavaScript/4-service/db.js
@@ -11,15 +11,15 @@ const pool = new pg.Pool({
 });
 
 module.exports = (table) => ({
-  query(sql, args) {
-    return pool.query(sql, args);
+  async query(sql, args) {
+    return await pool.query(sql, args);
   },
 
-  read(id, fields = ['*']) {
+  async read(id, fields = ['*']) {
     const names = fields.join(', ');
     const sql = `SELECT ${names} FROM ${table}`;
     if (!id) return pool.query(sql);
-    return pool.query(`${sql} WHERE id = $1`, [id]);
+    return await pool.query(`${sql} WHERE id = $1`, [id]);
   },
 
   async create({ ...record }) {
@@ -34,7 +34,7 @@ module.exports = (table) => ({
     const fields = '"' + keys.join('", "') + '"';
     const params = nums.join(', ');
     const sql = `INSERT INTO "${table}" (${fields}) VALUES (${params})`;
-    return pool.query(sql, data);
+    return await pool.query(sql, data);
   },
 
   async update(id, { ...record }) {
@@ -49,11 +49,11 @@ module.exports = (table) => ({
     const delta = updates.join(', ');
     const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`;
     data.push(id);
-    return pool.query(sql, data);
+    return await pool.query(sql, data);
   },
 
-  delete(id) {
+  async delete(id) {
     const sql = `DELETE FROM ${table} WHERE id = $1`;
-    return pool.query(sql, [id]);
+    return await pool.query(sql, [id]);
   },
 });
diff --git a/JavaScript/4-service/user.js b/JavaScript/4-service/user.js
@@ -6,21 +6,21 @@ const hash = require('./hash.js');
 const users = db('users');
 
 module.exports = {
-  read(id) {
-    return users.read(id, ['id', 'login']);
+  async read(id) {
+    return await users.read(id, ['id', 'login']);
   },
 
   async create({ login, password }) {
     const passwordHash = await hash(password);
-    return users.create({ login, password: passwordHash });
+    return await users.create({ login, password: passwordHash });
   },
 
   async update(id, { login, password }) {
     const passwordHash = await hash(password);
-    return users.update(id, { login, password: passwordHash });
+    return await users.update(id, { login, password: passwordHash });
   },
 
-  delete(id) {
-    return users.delete(id);
+  async delete(id) {
+    return await users.delete(id);
   },
 };
diff --git a/JavaScript/5-agnostic/db.js b/JavaScript/5-agnostic/db.js
@@ -11,15 +11,15 @@ const pool = new pg.Pool({
 });
 
 module.exports = (table) => ({
-  query(sql, args) {
-    return pool.query(sql, args);
+  async query(sql, args) {
+    return await pool.query(sql, args);
   },
 
-  read(id, fields = ['*']) {
+  async read(id, fields = ['*']) {
     const names = fields.join(', ');
     const sql = `SELECT ${names} FROM ${table}`;
     if (!id) return pool.query(sql);
-    return pool.query(`${sql} WHERE id = $1`, [id]);
+    return await pool.query(`${sql} WHERE id = $1`, [id]);
   },
 
   async create({ ...record }) {
@@ -34,7 +34,7 @@ module.exports = (table) => ({
     const fields = '"' + keys.join('", "') + '"';
     const params = nums.join(', ');
     const sql = `INSERT INTO "${table}" (${fields}) VALUES (${params})`;
-    return pool.query(sql, data);
+    return await pool.query(sql, data);
   },
 
   async update(id, { ...record }) {
@@ -49,11 +49,11 @@ module.exports = (table) => ({
     const delta = updates.join(', ');
     const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`;
     data.push(id);
-    return pool.query(sql, data);
+    return await pool.query(sql, data);
   },
 
-  delete(id) {
+  async delete(id) {
     const sql = `DELETE FROM ${table} WHERE id = $1`;
-    return pool.query(sql, [id]);
+    return await pool.query(sql, [id]);
   },
 });
diff --git a/JavaScript/5-agnostic/user.js b/JavaScript/5-agnostic/user.js
@@ -6,21 +6,21 @@ const hash = require('./hash.js');
 const users = db('users');
 
 module.exports = {
-  read(id) {
-    return users.read(id, ['id', 'login']);
+  async read(id) {
+    return await users.read(id, ['id', 'login']);
   },
 
   async create({ login, password }) {
     const passwordHash = await hash(password);
-    return users.create({ login, password: passwordHash });
+    return await users.create({ login, password: passwordHash });
   },
 
   async update(id, { login, password }) {
     const passwordHash = await hash(password);
-    return users.update(id, { login, password: passwordHash });
+    return await users.update(id, { login, password: passwordHash });
   },
 
-  delete(id) {
-    return users.delete(id);
+  async delete(id) {
+    return await users.delete(id);
   },
 };
diff --git a/JavaScript/6-ws/db.js b/JavaScript/6-ws/db.js
@@ -11,15 +11,15 @@ const pool = new pg.Pool({
 });
 
 module.exports = (table) => ({
-  query(sql, args) {
-    return pool.query(sql, args);
+  async query(sql, args) {
+    return await pool.query(sql, args);
   },
 
-  read(id, fields = ['*']) {
+  async read(id, fields = ['*']) {
     const names = fields.join(', ');
     const sql = `SELECT ${names} FROM ${table}`;
     if (!id) return pool.query(sql);
-    return pool.query(`${sql} WHERE id = $1`, [id]);
+    return await pool.query(`${sql} WHERE id = $1`, [id]);
   },
 
   async create({ ...record }) {
@@ -34,7 +34,7 @@ module.exports = (table) => ({
     const fields = '"' + keys.join('", "') + '"';
     const params = nums.join(', ');
     const sql = `INSERT INTO "${table}" (${fields}) VALUES (${params})`;
-    return pool.query(sql, data);
+    return await pool.query(sql, data);
   },
 
   async update(id, { ...record }) {
@@ -49,11 +49,11 @@ module.exports = (table) => ({
     const delta = updates.join(', ');
     const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`;
     data.push(id);
-    return pool.query(sql, data);
+    return await pool.query(sql, data);
   },
 
-  delete(id) {
+  async delete(id) {
     const sql = `DELETE FROM ${table} WHERE id = $1`;
-    return pool.query(sql, [id]);
+    return await pool.query(sql, [id]);
   },
 });
diff --git a/JavaScript/6-ws/user.js b/JavaScript/6-ws/user.js
@@ -6,26 +6,26 @@ const hash = require('./hash.js');
 const users = db('users');
 
 module.exports = {
-  read(id) {
-    return users.read(id, ['id', 'login']);
+  async read(id) {
+    return await users.read(id, ['id', 'login']);
   },
 
   async create({ login, password }) {
     const passwordHash = await hash(password);
-    return users.create({ login, password: passwordHash });
+    return await users.create({ login, password: passwordHash });
   },
 
   async update(id, { login, password }) {
     const passwordHash = await hash(password);
-    return users.update(id, { login, password: passwordHash });
+    return await users.update(id, { login, password: passwordHash });
   },
 
-  delete(id) {
-    return users.delete(id);
+  async delete(id) {
+    return await users.delete(id);
   },
 
-  find(mask) {
+  async find(mask) {
     const sql = 'SELECT login from users where login like $1';
-    return users.query(sql, [mask]);
+    return await users.query(sql, [mask]);
   },
 };
diff --git a/JavaScript/7-fs/api/user.js b/JavaScript/7-fs/api/user.js
@@ -6,26 +6,26 @@ const hash = require('../hash.js');
 const users = db('users');
 
 module.exports = {
-  read(id) {
-    return users.read(id, ['id', 'login']);
+  async read(id) {
+    return await users.read(id, ['id', 'login']);
   },
 
   async create({ login, password }) {
     const passwordHash = await hash(password);
-    return users.create({ login, password: passwordHash });
+    return await users.create({ login, password: passwordHash });
   },
 
   async update(id, { login, password }) {
     const passwordHash = await hash(password);
-    return users.update(id, { login, password: passwordHash });
+    return await users.update(id, { login, password: passwordHash });
   },
 
-  delete(id) {
-    return users.delete(id);
+  async delete(id) {
+    return await users.delete(id);
   },
 
-  find(mask) {
+  async find(mask) {
     const sql = 'SELECT login from users where login like $1';
-    return users.query(sql, [mask]);
+    return await users.query(sql, [mask]);
   },
 };
diff --git a/JavaScript/7-fs/db.js b/JavaScript/7-fs/db.js
@@ -11,15 +11,15 @@ const pool = new pg.Pool({
 });
 
 module.exports = (table) => ({
-  query(sql, args) {
-    return pool.query(sql, args);
+  async query(sql, args) {
+    return await pool.query(sql, args);
   },
 
-  read(id, fields = ['*']) {
+  async read(id, fields = ['*']) {
     const names = fields.join(', ');
     const sql = `SELECT ${names} FROM ${table}`;
     if (!id) return pool.query(sql);
-    return pool.query(`${sql} WHERE id = $1`, [id]);
+    return await pool.query(`${sql} WHERE id = $1`, [id]);
   },
 
   async create({ ...record }) {
@@ -34,7 +34,7 @@ module.exports = (table) => ({
     const fields = '"' + keys.join('", "') + '"';
     const params = nums.join(', ');
     const sql = `INSERT INTO "${table}" (${fields}) VALUES (${params})`;
-    return pool.query(sql, data);
+    return await pool.query(sql, data);
   },
 
   async update(id, { ...record }) {
@@ -49,11 +49,11 @@ module.exports = (table) => ({
     const delta = updates.join(', ');
     const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`;
     data.push(id);
-    return pool.query(sql, data);
+    return await pool.query(sql, data);
   },
 
-  delete(id) {
+  async delete(id) {
     const sql = `DELETE FROM ${table} WHERE id = $1`;
-    return pool.query(sql, [id]);
+    return await pool.query(sql, [id]);
   },
 });
diff --git a/JavaScript/8-vm/api/country.js b/JavaScript/8-vm/api/country.js
@@ -1,13 +1,13 @@
 const country = db('country');
 
 ({
-  read(id) {
+  async read(id) {
     console.log({ db });
-    return country.read(id);
+    return await country.read(id);
   },
 
-  find(mask) {
+  async find(mask) {
     const sql = 'SELECT * from country where name like $1';
-    return country.query(sql, [mask]);
+    return await country.query(sql, [mask]);
   },
 });