Skip to content

Commit e30d714

Browse files
RohovAlextshemsedinov
RohovAlex
authored and
tshemsedinov
committed
added async to methods in api and await in return for async methods
1 parent 3557121 commit e30d714

File tree

16 files changed

+114
-114
lines changed

16 files changed

+114
-114
lines changed

‎JavaScript/2-controller/main.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,27 @@ const pool = new pg.Pool({
1717

1818
const routing = {
1919
user: {
20-
get(id) {
20+
async get(id) {
2121
if (!id) return pool.query('SELECT id, login FROM users');
2222
const sql = 'SELECT id, login FROM users WHERE id = $1';
23-
return pool.query(sql, [id]);
23+
return await pool.query(sql, [id]);
2424
},
2525

2626
async post({ login, password }) {
2727
const sql = 'INSERT INTO users (login, password) VALUES ($1, $2)';
2828
const passwordHash = await hash(password);
29-
return pool.query(sql, [login, passwordHash]);
29+
return await pool.query(sql, [login, passwordHash]);
3030
},
3131

3232
async put(id, { login, password }) {
3333
const sql = 'UPDATE users SET login = $1, password = $2 WHERE id = $3';
3434
const passwordHash = await hash(password);
35-
return pool.query(sql, [login, passwordHash, id]);
35+
return await pool.query(sql, [login, passwordHash, id]);
3636
},
3737

38-
delete(id) {
38+
async delete(id) {
3939
const sql = 'DELETE FROM users WHERE id = $1';
40-
return pool.query(sql, [id]);
40+
return await pool.query(sql, [id]);
4141
},
4242
},
4343
};

‎JavaScript/3-crud/db.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ const pool = new pg.Pool({
1111
});
1212

1313
module.exports = (table) => ({
14-
query(sql, args) {
15-
return pool.query(sql, args);
14+
async query(sql, args) {
15+
return await pool.query(sql, args);
1616
},
1717

18-
read(id, fields = ['*']) {
18+
async read(id, fields = ['*']) {
1919
const names = fields.join(', ');
2020
const sql = `SELECT ${names} FROM ${table}`;
2121
if (!id) return pool.query(sql);
22-
return pool.query(`${sql} WHERE id = $1`, [id]);
22+
return await pool.query(`${sql} WHERE id = $1`, [id]);
2323
},
2424

2525
async create({ ...record }) {
@@ -34,7 +34,7 @@ module.exports = (table) => ({
3434
const fields = '"' + keys.join('", "') + '"';
3535
const params = nums.join(', ');
3636
const sql = `INSERT INTO "${table}" (${fields}) VALUES (${params})`;
37-
return pool.query(sql, data);
37+
return await pool.query(sql, data);
3838
},
3939

4040
async update(id, { ...record }) {
@@ -49,11 +49,11 @@ module.exports = (table) => ({
4949
const delta = updates.join(', ');
5050
const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`;
5151
data.push(id);
52-
return pool.query(sql, data);
52+
return await pool.query(sql, data);
5353
},
5454

55-
delete(id) {
55+
async delete(id) {
5656
const sql = `DELETE FROM ${table} WHERE id = $1`;
57-
return pool.query(sql, [id]);
57+
return await pool.query(sql, [id]);
5858
},
5959
});

‎JavaScript/4-service/db.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ const pool = new pg.Pool({
1111
});
1212

1313
module.exports = (table) => ({
14-
query(sql, args) {
15-
return pool.query(sql, args);
14+
async query(sql, args) {
15+
return await pool.query(sql, args);
1616
},
1717

18-
read(id, fields = ['*']) {
18+
async read(id, fields = ['*']) {
1919
const names = fields.join(', ');
2020
const sql = `SELECT ${names} FROM ${table}`;
2121
if (!id) return pool.query(sql);
22-
return pool.query(`${sql} WHERE id = $1`, [id]);
22+
return await pool.query(`${sql} WHERE id = $1`, [id]);
2323
},
2424

2525
async create({ ...record }) {
@@ -34,7 +34,7 @@ module.exports = (table) => ({
3434
const fields = '"' + keys.join('", "') + '"';
3535
const params = nums.join(', ');
3636
const sql = `INSERT INTO "${table}" (${fields}) VALUES (${params})`;
37-
return pool.query(sql, data);
37+
return await pool.query(sql, data);
3838
},
3939

4040
async update(id, { ...record }) {
@@ -49,11 +49,11 @@ module.exports = (table) => ({
4949
const delta = updates.join(', ');
5050
const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`;
5151
data.push(id);
52-
return pool.query(sql, data);
52+
return await pool.query(sql, data);
5353
},
5454

55-
delete(id) {
55+
async delete(id) {
5656
const sql = `DELETE FROM ${table} WHERE id = $1`;
57-
return pool.query(sql, [id]);
57+
return await pool.query(sql, [id]);
5858
},
5959
});

‎JavaScript/4-service/user.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ const hash = require('./hash.js');
66
const users = db('users');
77

88
module.exports = {
9-
read(id) {
10-
return users.read(id, ['id', 'login']);
9+
async read(id) {
10+
return await users.read(id, ['id', 'login']);
1111
},
1212

1313
async create({ login, password }) {
1414
const passwordHash = await hash(password);
15-
return users.create({ login, password: passwordHash });
15+
return await users.create({ login, password: passwordHash });
1616
},
1717

1818
async update(id, { login, password }) {
1919
const passwordHash = await hash(password);
20-
return users.update(id, { login, password: passwordHash });
20+
return await users.update(id, { login, password: passwordHash });
2121
},
2222

23-
delete(id) {
24-
return users.delete(id);
23+
async delete(id) {
24+
return await users.delete(id);
2525
},
2626
};

‎JavaScript/5-agnostic/db.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ const pool = new pg.Pool({
1111
});
1212

1313
module.exports = (table) => ({
14-
query(sql, args) {
15-
return pool.query(sql, args);
14+
async query(sql, args) {
15+
return await pool.query(sql, args);
1616
},
1717

18-
read(id, fields = ['*']) {
18+
async read(id, fields = ['*']) {
1919
const names = fields.join(', ');
2020
const sql = `SELECT ${names} FROM ${table}`;
2121
if (!id) return pool.query(sql);
22-
return pool.query(`${sql} WHERE id = $1`, [id]);
22+
return await pool.query(`${sql} WHERE id = $1`, [id]);
2323
},
2424

2525
async create({ ...record }) {
@@ -34,7 +34,7 @@ module.exports = (table) => ({
3434
const fields = '"' + keys.join('", "') + '"';
3535
const params = nums.join(', ');
3636
const sql = `INSERT INTO "${table}" (${fields}) VALUES (${params})`;
37-
return pool.query(sql, data);
37+
return await pool.query(sql, data);
3838
},
3939

4040
async update(id, { ...record }) {
@@ -49,11 +49,11 @@ module.exports = (table) => ({
4949
const delta = updates.join(', ');
5050
const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`;
5151
data.push(id);
52-
return pool.query(sql, data);
52+
return await pool.query(sql, data);
5353
},
5454

55-
delete(id) {
55+
async delete(id) {
5656
const sql = `DELETE FROM ${table} WHERE id = $1`;
57-
return pool.query(sql, [id]);
57+
return await pool.query(sql, [id]);
5858
},
5959
});

‎JavaScript/5-agnostic/user.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ const hash = require('./hash.js');
66
const users = db('users');
77

88
module.exports = {
9-
read(id) {
10-
return users.read(id, ['id', 'login']);
9+
async read(id) {
10+
return await users.read(id, ['id', 'login']);
1111
},
1212

1313
async create({ login, password }) {
1414
const passwordHash = await hash(password);
15-
return users.create({ login, password: passwordHash });
15+
return await users.create({ login, password: passwordHash });
1616
},
1717

1818
async update(id, { login, password }) {
1919
const passwordHash = await hash(password);
20-
return users.update(id, { login, password: passwordHash });
20+
return await users.update(id, { login, password: passwordHash });
2121
},
2222

23-
delete(id) {
24-
return users.delete(id);
23+
async delete(id) {
24+
return await users.delete(id);
2525
},
2626
};

‎JavaScript/6-ws/db.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ const pool = new pg.Pool({
1111
});
1212

1313
module.exports = (table) => ({
14-
query(sql, args) {
15-
return pool.query(sql, args);
14+
async query(sql, args) {
15+
return await pool.query(sql, args);
1616
},
1717

18-
read(id, fields = ['*']) {
18+
async read(id, fields = ['*']) {
1919
const names = fields.join(', ');
2020
const sql = `SELECT ${names} FROM ${table}`;
2121
if (!id) return pool.query(sql);
22-
return pool.query(`${sql} WHERE id = $1`, [id]);
22+
return await pool.query(`${sql} WHERE id = $1`, [id]);
2323
},
2424

2525
async create({ ...record }) {
@@ -34,7 +34,7 @@ module.exports = (table) => ({
3434
const fields = '"' + keys.join('", "') + '"';
3535
const params = nums.join(', ');
3636
const sql = `INSERT INTO "${table}" (${fields}) VALUES (${params})`;
37-
return pool.query(sql, data);
37+
return await pool.query(sql, data);
3838
},
3939

4040
async update(id, { ...record }) {
@@ -49,11 +49,11 @@ module.exports = (table) => ({
4949
const delta = updates.join(', ');
5050
const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`;
5151
data.push(id);
52-
return pool.query(sql, data);
52+
return await pool.query(sql, data);
5353
},
5454

55-
delete(id) {
55+
async delete(id) {
5656
const sql = `DELETE FROM ${table} WHERE id = $1`;
57-
return pool.query(sql, [id]);
57+
return await pool.query(sql, [id]);
5858
},
5959
});

‎JavaScript/6-ws/user.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@ const hash = require('./hash.js');
66
const users = db('users');
77

88
module.exports = {
9-
read(id) {
10-
return users.read(id, ['id', 'login']);
9+
async read(id) {
10+
return await users.read(id, ['id', 'login']);
1111
},
1212

1313
async create({ login, password }) {
1414
const passwordHash = await hash(password);
15-
return users.create({ login, password: passwordHash });
15+
return await users.create({ login, password: passwordHash });
1616
},
1717

1818
async update(id, { login, password }) {
1919
const passwordHash = await hash(password);
20-
return users.update(id, { login, password: passwordHash });
20+
return await users.update(id, { login, password: passwordHash });
2121
},
2222

23-
delete(id) {
24-
return users.delete(id);
23+
async delete(id) {
24+
return await users.delete(id);
2525
},
2626

27-
find(mask) {
27+
async find(mask) {
2828
const sql = 'SELECT login from users where login like $1';
29-
return users.query(sql, [mask]);
29+
return await users.query(sql, [mask]);
3030
},
3131
};

‎JavaScript/7-fs/api/user.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@ const hash = require('../hash.js');
66
const users = db('users');
77

88
module.exports = {
9-
read(id) {
10-
return users.read(id, ['id', 'login']);
9+
async read(id) {
10+
return await users.read(id, ['id', 'login']);
1111
},
1212

1313
async create({ login, password }) {
1414
const passwordHash = await hash(password);
15-
return users.create({ login, password: passwordHash });
15+
return await users.create({ login, password: passwordHash });
1616
},
1717

1818
async update(id, { login, password }) {
1919
const passwordHash = await hash(password);
20-
return users.update(id, { login, password: passwordHash });
20+
return await users.update(id, { login, password: passwordHash });
2121
},
2222

23-
delete(id) {
24-
return users.delete(id);
23+
async delete(id) {
24+
return await users.delete(id);
2525
},
2626

27-
find(mask) {
27+
async find(mask) {
2828
const sql = 'SELECT login from users where login like $1';
29-
return users.query(sql, [mask]);
29+
return await users.query(sql, [mask]);
3030
},
3131
};

‎JavaScript/7-fs/db.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ const pool = new pg.Pool({
1111
});
1212

1313
module.exports = (table) => ({
14-
query(sql, args) {
15-
return pool.query(sql, args);
14+
async query(sql, args) {
15+
return await pool.query(sql, args);
1616
},
1717

18-
read(id, fields = ['*']) {
18+
async read(id, fields = ['*']) {
1919
const names = fields.join(', ');
2020
const sql = `SELECT ${names} FROM ${table}`;
2121
if (!id) return pool.query(sql);
22-
return pool.query(`${sql} WHERE id = $1`, [id]);
22+
return await pool.query(`${sql} WHERE id = $1`, [id]);
2323
},
2424

2525
async create({ ...record }) {
@@ -34,7 +34,7 @@ module.exports = (table) => ({
3434
const fields = '"' + keys.join('", "') + '"';
3535
const params = nums.join(', ');
3636
const sql = `INSERT INTO "${table}" (${fields}) VALUES (${params})`;
37-
return pool.query(sql, data);
37+
return await pool.query(sql, data);
3838
},
3939

4040
async update(id, { ...record }) {
@@ -49,11 +49,11 @@ module.exports = (table) => ({
4949
const delta = updates.join(', ');
5050
const sql = `UPDATE ${table} SET ${delta} WHERE id = $${++i}`;
5151
data.push(id);
52-
return pool.query(sql, data);
52+
return await pool.query(sql, data);
5353
},
5454

55-
delete(id) {
55+
async delete(id) {
5656
const sql = `DELETE FROM ${table} WHERE id = $1`;
57-
return pool.query(sql, [id]);
57+
return await pool.query(sql, [id]);
5858
},
5959
});

‎JavaScript/8-vm/api/country.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
const country = db('country');
22

33
({
4-
read(id) {
4+
async read(id) {
55
console.log({ db });
6-
return country.read(id);
6+
return await country.read(id);
77
},
88

9-
find(mask) {
9+
async find(mask) {
1010
const sql = 'SELECT * from country where name like $1';
11-
return country.query(sql, [mask]);
11+
return await country.query(sql, [mask]);
1212
},
1313
});

0 commit comments

Comments
 (0)