Skip to content

Commit eac6157

Browse files
ggeerraarrddggeerraarrdd
committed
Create crud and helpers modules
1 parent 56f11d1 commit eac6157

File tree

9 files changed

+395
-320
lines changed

9 files changed

+395
-320
lines changed

‎app/blueprints/cms/routes.py‎

Lines changed: 47 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,23 @@
33
import sqlite3
44

55
# Third-Party Libraries
6-
from flask import Blueprint, redirect, render_template, request
6+
from flask import redirect, render_template, request
77
from werkzeug.security import check_password_hash, generate_password_hash
88

9-
# Local Libraries
10-
from form import get_dicts, get_query, get_dicts_updates, get_query_update_series, get_query_update_schedules
11-
import queries
9+
# Local
10+
import helpers
11+
import crud
1212
from . import cms_bp
1313

1414

1515

16+
17+
18+
19+
20+
21+
22+
1623
# Set SQLite database variable
1724
db = "lafs.db"
1825

@@ -25,13 +32,13 @@ def cmsdash():
2532
series_id = active_series_id = 6
2633

2734
# Get info on [active] (1) series, (2) schedules, and (3) series ids
28-
series = dict(queries.get_info_series(db, series_id))
29-
next = queries.get_info_cms_next_film(db, series_id)
30-
films = queries.get_info_schedules(db, series_id)
31-
series_ids = queries.get_info_series_ids(db)
35+
series = dict(crud.get_info_series(db, series_id))
36+
next = crud.get_info_cms_next_film(db, series_id)
37+
films = crud.get_info_schedules(db, series_id)
38+
series_ids = crud.get_info_series_ids(db)
3239

33-
serieses = queries.get_info_serieses(db)
34-
# series_info = queries.get_info_series_status(db, series_id)
40+
serieses = crud.get_info_serieses(db)
41+
# series_info = crud.queries.get_info_series_status(db, series_id)
3542

3643
return render_template("cms_index.html",
3744
current_series=series,
@@ -49,12 +56,12 @@ def cmsseries():
4956
series_id = active_series_id = "6"
5057

5158
# Get info on [active] (1) series, (2) schedules, and (3) series ids
52-
series = dict(queries.get_info_series(db, series_id))
53-
schedules = queries.get_info_schedules(db, series_id)
54-
series_ids = queries.get_info_series_ids(db)
59+
series = dict(crud.queries.get_info_series(db, series_id))
60+
schedules = crud.queries.get_info_schedules(db, series_id)
61+
series_ids = crud.queries.get_info_series_ids(db)
5562

56-
serieses = queries.get_info_serieses(db)
57-
series_info = queries.get_info_series_status(db, series_id)
63+
serieses = crud.queries.get_info_serieses(db)
64+
series_info = crud.queries.get_info_series_status(db, series_id)
5865

5966
return render_template("cms_series.html",
6067
current_series=series,
@@ -71,7 +78,7 @@ def cmscreate():
7178

7279
post = request.form.to_dict()
7380

74-
dicts = get_dicts(post)
81+
dicts = helpers.get_dicts(post)
7582
dict_series = dicts[0]
7683
dict_schedule = dicts[1]
7784
dict_films = dicts[2]
@@ -86,17 +93,17 @@ def cmscreate():
8693
# FILM SERIES
8794
#
8895
# 1. Translate dict into SQL query
89-
query_series = get_query(dict_series)
96+
query_series = helpers.get_query(dict_series)
9097
# 2. Execute query
91-
new_series_id = queries.insert_new_series(db, query_series)
98+
new_series_id = crud.queries.insert_new_series(db, query_series)
9299

93100
#
94101
# FILMS
95102
#
96103
# 1. Translate dict into SQL query
97-
query_films = get_query(dict_films)
104+
query_films = helpers.get_query(dict_films)
98105
# 2. Execute query
99-
queries.insert_new_records(db, query_films)
106+
crud.queries.insert_new_records(db, query_films)
100107

101108
#
102109
# SCHEDULE
@@ -108,19 +115,19 @@ def cmscreate():
108115
if "id" in dict_schedule[film]:
109116
dict_schedule[film]["film_id"] = dict_schedule[film].pop("id")
110117
# 1. Translate dict into SQL query
111-
query_schedule = get_query(dict_schedule)
118+
query_schedule = helpers.get_query(dict_schedule)
112119
# 2. Execute query
113-
queries.insert_new_records(db, query_schedule)
120+
crud.queries.insert_new_records(db, query_schedule)
114121

115122
#
116123
# COLORS
117124
#
118125
# 0. Update dictionary
119126
dict_colors = {"series_id": new_series_id, **dict_colors}
120127
# 1. Translate dict into SQL query
121-
query_colors = get_query(dict_colors)
128+
query_colors = helpers.get_query(dict_colors)
122129
# 2. Execute query
123-
queries.insert_new_records(db, query_colors)
130+
crud.queries.insert_new_records(db, query_colors)
124131

125132

126133
print(query_series)
@@ -144,7 +151,7 @@ def cms_view():
144151

145152
# print(json.dumps(post, indent=4))
146153

147-
dicts = get_dicts_updates(post)
154+
dicts = helpers.get_dicts_updates(post)
148155
dict_series = dicts[0]
149156
dict_schedule = dicts[1]
150157
# dict_films = dicts[2]
@@ -159,11 +166,11 @@ def cms_view():
159166
# FILM SERIES
160167
#
161168
# 1. Translate dict into SQL query
162-
query_series = get_query_update_series(dict_series)
169+
query_series = helpers.get_query_update_series(dict_series)
163170
# 2. Execute query
164171
if query_series is not None:
165172
print(query_series)
166-
queries.update_records(db, query_series)
173+
crud.queries.update_records(db, query_series)
167174
else:
168175
print("Series: nothing to update")
169176

@@ -175,22 +182,22 @@ def cms_view():
175182
if "id" in dict_schedule[film]:
176183
dict_schedule[film]["film_id"] = dict_schedule[film].pop("id")
177184
# 1. Translate dict into SQL query
178-
query_schedule = get_query_update_schedules(dict_schedule)
185+
query_schedule = helpers.get_query_update_schedules(dict_schedule)
179186
print(query_schedule)
180187
# 2. Execute query
181188
if query_schedule is not None:
182189
for query in query_schedule:
183-
queries.update_records(db, query)
190+
crud.queries.update_records(db, query)
184191

185192
return redirect("/cms")
186193

187194
else:
188195
cms_series_id = request.args.get('id')
189196

190-
cms_series = dict(queries.get_info_series(db, cms_series_id))
191-
cms_schedules = queries.get_info_cms_schedules(db, cms_series_id)
197+
cms_series = dict(crud.queries.get_info_series(db, cms_series_id))
198+
cms_schedules = crud.queries.get_info_cms_schedules(db, cms_series_id)
192199

193-
cms_serieses = queries.get_info_serieses(db)
200+
cms_serieses = crud.queries.get_info_serieses(db)
194201
cms_status = next((series for series in cms_serieses if series['series_id'] == int(cms_series_id)), None)
195202

196203
if cms_status['status'] == 1:
@@ -226,7 +233,7 @@ def cms_unpublish():
226233
@cms_bp.route("/cms/films")
227234
def cmsfilms():
228235

229-
films = queries.get_info_cms_films(db)
236+
films = crud.queries.get_info_cms_films(db)
230237

231238
return render_template("cms_films.html",
232239
films=films,
@@ -240,15 +247,15 @@ def cmsorg():
240247

241248
user_id = request.form.get("user-id")
242249

243-
user = queries.get_info_user(db, user_id)
250+
user = crud.queries.get_info_user(db, user_id)
244251

245252
return render_template("cms_user.html",
246253
user=user,
247254
sidebar="org")
248255

249256
else:
250257

251-
users = queries.get_info_users(db)
258+
users = crud.queries.get_info_users(db)
252259

253260
return render_template("cms_org.html",
254261
users=users,
@@ -305,7 +312,7 @@ def cmsuser():
305312
form_name = request.form.get('form')
306313
user_id = request.form.get('user-id')
307314

308-
user = queries.get_info_user(db, user_id)
315+
user = crud.queries.get_info_user(db, user_id)
309316

310317
if form_name == "info":
311318

@@ -338,7 +345,7 @@ def cmsuser():
338345
update += 1
339346

340347
if update > 0:
341-
queries.update_user_info(db,
348+
crud.queries.update_user_info(db,
342349
updated_name_first,
343350
updated_name_last,
344351
updated_username,
@@ -353,7 +360,7 @@ def cmsuser():
353360
updated_status = int(request.form.get("status"))
354361

355362
if current_status != updated_status:
356-
queries.update_user_status(db, updated_status, user_id)
363+
crud.queries.update_user_status(db, updated_status, user_id)
357364

358365
return redirect("/cms/org")
359366

@@ -367,7 +374,7 @@ def cmsuser():
367374

368375
if check_password_hash(user["hash"], pass_current_form) and pass_updated == pass_updated_again:
369376

370-
queries.update_user_hash(db, generate_password_hash(pass_updated_again), user_id)
377+
crud.queries.update_user_hash(db, generate_password_hash(pass_updated_again), user_id)
371378

372379
print("Password saved")
373380

@@ -378,7 +385,7 @@ def cmsuser():
378385

379386
elif form_name == "delete":
380387

381-
queries.delete_user(db, user_id)
388+
crud.queries.delete_user(db, user_id)
382389

383390
return redirect("/cms/org")
384391

‎app/blueprints/main/routes.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
from flask import session
1010

1111
# Local
12-
from helpers import get_series_data
13-
import queries
12+
import helpers
13+
import crud
1414
from . import main_bp
1515

1616

@@ -43,7 +43,7 @@ def index():
4343
return redirect("/")
4444

4545
# Get info of [current] series id
46-
query_result = queries.get_id_current_series(DATABASE_NAME)
46+
query_result = crud.get_id_current_series(DATABASE_NAME)
4747

4848
# Update session
4949
session["active_series_id"] = session["current_series_id"] = query_result[0]
@@ -55,7 +55,7 @@ def index():
5555
series_id = session["active_series_id"]
5656

5757
# Get info on [past] (1) series, (2) schedules, and (3) series ids
58-
series, schedules, series_ids = get_series_data(DATABASE_NAME, series_id)
58+
series, schedules, series_ids = helpers.get_series_data(DATABASE_NAME, series_id)
5959

6060
return render_template("index.html",
6161
series=series,
@@ -95,7 +95,7 @@ def series_view():
9595
session["active_series_id"] = series_id
9696

9797
# Get info on [past] (1) series, (2) schedules, and (3) series ids
98-
series, schedules, series_ids = get_series_data(DATABASE_NAME, series_id)
98+
series, schedules, series_ids = helpers.get_series_data(DATABASE_NAME, series_id)
9999

100100
return render_template("index.html",
101101
series=series,
@@ -132,10 +132,10 @@ def film_view():
132132
film_id = request.form.get("film-id")
133133

134134
# Get info on [past] (1) series, (2) schedules, and (3) series ids
135-
series, schedules, series_ids = get_series_data(DATABASE_NAME, series_id)
135+
series, schedules, series_ids = helpers.get_series_data(DATABASE_NAME, series_id)
136136

137137
# Get info of requested film
138-
film = queries.get_info_film(DATABASE_NAME, film_id)
138+
film = crud.get_info_film(DATABASE_NAME, film_id)
139139

140140
return render_template("film.html",
141141
series=series,
@@ -162,7 +162,7 @@ def location_view():
162162
series_id = session["active_series_id"]
163163

164164
# Get info on [past] (1) series, (2) schedules, and (3) series ids
165-
series, schedules, series_ids = get_series_data(DATABASE_NAME, series_id)
165+
series, schedules, series_ids = helpers.get_series_data(DATABASE_NAME, series_id)
166166

167167
return render_template("location.html",
168168
series=series,
@@ -187,7 +187,7 @@ def org_view():
187187
series_id = session["active_series_id"]
188188

189189
# Get info on [past] (1) series, (2) schedules, and (3) series ids
190-
series, schedules, series_ids = get_series_data(DATABASE_NAME, series_id)
190+
series, schedules, series_ids = helpers.get_series_data(DATABASE_NAME, series_id)
191191

192192
return render_template("org.html",
193193
series=series,

‎app/crud/__init__.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Local
2+
from .crud_cms import *
3+
from .crud_main import *
4+
5+
6+
7+

0 commit comments

Comments
 (0)