fixing linter issues

Author: gubanovpm

.editorconfig

@@ -7,7 +7,7 @@ charset = utf-8
 
 [**/*.sql]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 
 [*.yaml]

.github/workflows/ci.yml

@@ -31,11 +31,11 @@ jobs:
         run : |
           pip install sqlfluff
 
-      - name: Run sqlfluf for PostgreSQL
-        run : sqlfluf lint --dialect postgres database/init-scripts/*.sql
+      - name: Run sqlfluff for PostgreSQL
+        run : sqlfluff lint --dialect postgres database/init-scripts/*.sql
 
-      - name: Run sqlfluf for bank-service
-        run : sqlfluf lint --dialect sqlite bank-service/database/bank-schema.sql
+      - name: Run sqlfluff for bank-service
+        run : sqlfluff lint --dialect sqlite bank-service/database/bank-schema.sql
 
   check_store_service:
     runs-on: ubuntu-latest

bank-service/app.py

@@ -1,14 +1,13 @@
 import os
 import base64
 
+from flask import Flask
+
 from routes.routes import routes_blueprint
 from database.db import init_database
 
-from flask import Flask
-
 app = Flask(__name__)
 
-
 # initial state of database
 init_database()
 

database/init-scripts/10-bank-schema.sql

@@ -13,4 +13,3 @@ CREATE TABLE IF NOT EXISTS transactions (
 
     FOREIGN KEY (user_id) REFERENCES accounts
 );
-

database/init-scripts/25-store-init.sql

@@ -1,32 +1,61 @@
-COPY users (id, password_hash, name, balance) 
-FROM '/store-init-csvs/init-data-users.csv' 
-WITH (FORMAT CSV, HEADER, DELIMITER ',');
-SELECT setval(pg_get_serial_sequence('users', 'id'), COALESCE(MAX(id), 0) + 1) FROM users;
+-- init users
+COPY users (id, password_hash, name, balance)
+FROM '/store-init-csvs/init-data-users.csv'
+WITH (FORMAT csv, HEADER, DELIMITER ',');
 
-COPY tags(id, name) 
-FROM '/store-init-csvs/init-data-tags.csv' 
-WITH (FORMAT CSV, HEADER, DELIMITER ',');
-SELECT setval(pg_get_serial_sequence('tags', 'id'), COALESCE(MAX(id), 0) + 1) FROM tags;
-
-COPY studios(id, name) 
+SELECT
+    setval(
+        pg_get_serial_sequence('users', 'id'),
+        coalesce(max(id), 0) + 1
+    )
+FROM users;
+-- init tags
+COPY tags (id, name)
+FROM '/store-init-csvs/init-data-tags.csv'
+WITH (FORMAT csv, HEADER, DELIMITER ',');
+SELECT
+    setval(
+        pg_get_serial_sequence('tags', 'id'),
+        coalesce(max(id), 0) + 1
+    )
+FROM tags;
+-- init studios
+COPY studios (id, name)
 FROM '/store-init-csvs/init-data-studios.csv'
-WITH (FORMAT CSV, HEADER, DELIMITER ',');
-SELECT setval(pg_get_serial_sequence('studios', 'id'), COALESCE(MAX(id), 0) + 1) FROM studios;
+WITH (FORMAT csv, HEADER, DELIMITER ',');
 
-COPY games(id, name, price, description, brief, studio_id)
+SELECT
+    setval(
+        pg_get_serial_sequence('studios', 'id'),
+        coalesce(max(id), 0) + 1
+    )
+FROM studios;
+-- init games
+COPY games (id, name, price, description, brief, studio_id)
 FROM '/store-init-csvs/init-data-games.csv'
-WITH (FORMAT CSV, HEADER, DELIMITER ',');
-SELECT setval(pg_get_serial_sequence('games', 'id'), COALESCE(MAX(id), 0) + 1) FROM games;
+WITH (FORMAT csv, HEADER, DELIMITER ',');
 
-COPY game_tags(game_id, tag_id)
+SELECT
+    setval(
+        pg_get_serial_sequence('games', 'id'),
+        coalesce(max(id), 0) + 1
+    )
+FROM games;
+-- init game_tags
+COPY game_tags (game_id, tag_id)
 FROM '/store-init-csvs/init-data-game-tags.csv'
-WITH (FORMAT CSV, HEADER, DELIMITER ',');
-
-COPY purchases(id, owner_id, buyer_id, ts, game_id)
+WITH (FORMAT csv, HEADER, DELIMITER ',');
+-- init purchases
+COPY purchases (id, owner_id, buyer_id, ts, game_id)
 FROM '/store-init-csvs/init-data-purchases.csv'
-WITH (FORMAT CSV, HEADER, DELIMITER ',', NULL 'NULL');
-SELECT setval(pg_get_serial_sequence('purchases', 'id'), COALESCE(MAX(id), 0) + 1) FROM purchases;
+WITH (FORMAT csv, HEADER, DELIMITER ',', NULL 'NULL');
 
+SELECT
+    setval(
+        pg_get_serial_sequence('purchases', 'id'),
+        coalesce(max(id), 0) + 1
+    )
+FROM purchases;
 -- create temporary table for games pictures to transform csv
 CREATE TEMP TABLE IF NOT EXISTS temp4gpictures (
     id INTEGER PRIMARY KEY,
@@ -37,48 +66,58 @@ CREATE TEMP TABLE IF NOT EXISTS temp4gpictures (
     img TEXT
 );
 
-COPY temp4gpictures 
-FROM '/store-init-csvs/init-games-pictures.csv' 
-WITH (FORMAT CSV, HEADER);
+COPY temp4gpictures
+FROM '/store-init-csvs/init-games-pictures.csv'
+WITH (FORMAT csv, HEADER, DELIMITER ',');
 
 INSERT INTO games_pictures (id, name, game_id, img_type, img_fmt)
 SELECT
     s.id,
-    s.id::TEXT || 'g.' || s.img_fmt as name,
+    s.id::TEXT || 'g.' || s.img_fmt AS picture_name,
     s.game_id,
     s.img_type,
     s.img_fmt
 FROM
-    temp4gpictures s
+    temp4gpictures AS s
 ON CONFLICT (id) DO NOTHING;
-SELECT setval(pg_get_serial_sequence('games_pictures', 'id'), COALESCE(MAX(id), 0) + 1) FROM games_pictures;
+SELECT
+    setval(
+        pg_get_serial_sequence('games_pictures', 'id'),
+        coalesce(max(id), 0) + 1
+    )
+FROM games_pictures;
 
 DROP TABLE temp4gpictures;
 -- end of copy games pictures
 
 -- create temporary table for profile pictures to transform csv
 CREATE TEMP TABLE IF NOT EXISTS temp4ppictures (
-  id INTEGER PRIMARY KEY,
-  name TEXT,
-  user_id INTEGER,
-  img_fmt TEXT,
-  img TEXT
+    id INTEGER PRIMARY KEY,
+    name TEXT,
+    user_id INTEGER,
+    img_fmt TEXT,
+    img TEXT
 );
 
 COPY temp4ppictures
 FROM '/store-init-csvs/init-profile-pictures.csv'
-WITH (FORMAT CSV, HEADER);
+WITH (FORMAT csv, HEADER, DELIMITER ',');
 
 INSERT INTO profiles_pictures (id, name, user_id, img_fmt)
 SELECT
-  s.id,
-  s.id::TEXT || 'p.' || s.img_fmt as name,
-  s.user_id,
-  s.img_fmt
+    s.id,
+    s.id::TEXT || 'p.' || s.img_fmt AS profile_pic_name,
+    s.user_id,
+    s.img_fmt
 FROM
-  temp4ppictures s
+    temp4ppictures AS s
 ON CONFLICT (id) DO NOTHING;
-SELECT setval(pg_get_serial_sequence('profiles_pictures', 'id'), COALESCE(MAX(id), 0) + 1) FROM profiles_pictures;
+SELECT
+    setval(
+        pg_get_serial_sequence('profiles_pictures', 'id'),
+        coalesce(max(id), 0) + 1
+    )
+FROM profiles_pictures;
 
 DROP TABLE temp4ppictures;