Skip to content

Commit ab7b56a

Browse files
givanzgivanz
committed
Fixed failed login models delete method
1 parent ce83b52 commit ab7b56a

6 files changed

+164
-314
lines changed

‎admin/sql/mysqli/admin_failed_login.sql

+30-55
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
CREATE PROCEDURE getAll(
66
IN start INT,
77
IN limit INT,
8-
IN user_id INT,
8+
IN admin_id INT,
99
IN count INT,
1010
IN updated_at CHAR,
1111

@@ -18,9 +18,9 @@
1818

1919
SELECT * FROM admin_failed_login WHERE 1 = 1
2020

21-
@IF isset(:user_id) AND !empty(:user_id)
21+
@IF isset(:admin_id) AND !empty(:admin_id)
2222
THEN
23-
AND admin_failed_login.user_id = :user_id
23+
AND admin_failed_login.admin_id = :admin_id
2424
END @IF
2525

2626
@IF isset(:count) AND !empty(:count)
@@ -44,13 +44,13 @@
4444
-- SELECT FOUND_ROWS() as count;
4545
SELECT count(*) FROM (
4646

47-
@SQL_COUNT(admin_failed_login.user_id, user) -- this takes previous query removes limit and replaces select columns with parameter user_id
47+
@SQL_COUNT(admin_failed_login.admin_id, admin) -- this takes previous query removes limit and replaces select columns with parameter admin_id
4848

4949
) as count;
5050

5151
END
5252

53-
-- get user information
53+
-- get admin information
5454

5555
CREATE PROCEDURE get(
5656
IN admin_id INT,
@@ -157,7 +157,7 @@
157157

158158
VALUES ( @result.admin, :updated_at, :last_ip )
159159

160-
DUPLICATE KEY UPDATE count = count + 1, last_ip = :last_ip
160+
ON DUPLICATE KEY UPDATE count = count + 1, last_ip = :last_ip
161161

162162
END @IF;
163163
END
@@ -184,11 +184,8 @@
184184
-- Update admin_failed_login
185185

186186
CREATE PROCEDURE edit(
187-
IN user CHAR,
188-
IN email CHAR,
189-
IN admin_id INT,
187+
IN admin_id INT,
190188
IN admin_failed_login ARRAY,
191-
IN role_id INT,
192189
OUT affected_rows
193190
)
194191
BEGIN
@@ -199,65 +196,43 @@
199196

200197
SET @LIST(:admin_failed_login)
201198

202-
WHERE
199+
WHERE admin_id = :admin_id;
203200

204-
@IF isset(:email)
205-
THEN
206-
email = :email
207-
END @IF
208-
209-
@IF isset(:admin_failed_login_id)
210-
THEN
211-
admin_failed_login_id = :admin_failed_login_id
212-
END @IF
213-
214-
@IF isset(:username)
215-
THEN
216-
username = :username
217-
END @IF
218201
END
219202

220203
-- delete admin_failed_login
221204

222205
PROCEDURE delete(
223-
IN user_id INT,
206+
IN admin_id ARRAY,
224207
IN updated_at CHAR,
225208
IN count INT,
226209

227210
OUT affected_rows
228211
)
229212
BEGIN
230213

231-
DELETE FROM admin_failed_login WHERE admin_failed_login_id IN (:admin_failed_login_id);
232-
233-
END
234-
235-
-- set role
214+
DELETE admin_failed_login FROM admin_failed_login
215+
INNER JOIN admin.admin_id ON admin = admin_failed_login.admin_id
216+
WHERE
236217

237-
CREATE PROCEDURE setRole(
238-
IN admin_failed_login_id INT,
239-
IN role CHAR,
240-
IN role_id INT
241-
OUT insert_id
242-
)
243-
BEGIN
244-
245-
246-
UPDATE admin_failed_login
247-
248-
SET
249-
250-
@IF isset(:role_id)
251-
THEN
252-
role_id = :role_id
253-
END @IF
218+
@IF isset(:admin_id) AND !empty(:admin_id)
219+
THEN
220+
AND admin_failed_login.admin_id = :admin_id
221+
END @IF
254222

223+
@IF isset(:username)
224+
THEN
225+
AND admin.username = :username
226+
END @IF
255227

256-
@IF isset(:role)
257-
THEN
258-
role_id = (SELECT role_id FROM roles WHERE name = :role)
259-
END @IF
228+
@IF isset(:email)
229+
THEN
230+
AND admin.email = :email
231+
END @IF
260232

261-
262-
WHERE admin_failed_login_id = :admin_failed_login_id
263-
END
233+
@IF isset(:admin_id)
234+
THEN
235+
AND admin.admin_id IN (:admin_id)
236+
END @IF
237+
238+
END

‎admin/sql/mysqli/user_failed_login.sql

+25-50
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
SELECT * FROM user_failed_login WHERE 1 = 1
2020

21-
@IF isset(:user_id) AND !empty(:user_id)
21+
@IF isset(:user_id) AND !empty(:user_id)
2222
THEN
2323
AND user_failed_login.user_id = :user_id
2424
END @IF
@@ -185,11 +185,8 @@
185185
-- Update user_failed_login
186186

187187
CREATE PROCEDURE edit(
188-
IN user CHAR,
189-
IN email CHAR,
190-
IN user_id INT,
188+
IN user_id INT,
191189
IN user_failed_login ARRAY,
192-
IN role_id INT,
193190
OUT affected_rows
194191
)
195192
BEGIN
@@ -200,65 +197,43 @@
200197

201198
SET @LIST(:user_failed_login)
202199

203-
WHERE
204-
205-
@IF isset(:email)
206-
THEN
207-
email = :email
208-
END @IF
200+
WHERE user_id = :user_id;
209201

210-
@IF isset(:user_failed_login_id)
211-
THEN
212-
user_failed_login_id = :user_failed_login_id
213-
END @IF
214-
215-
@IF isset(:username)
216-
THEN
217-
username = :username
218-
END @IF
219202
END
220203

221204
-- delete user_failed_login
222205

223206
PROCEDURE delete(
224-
IN user_id INT,
207+
IN user_id ARRAY,
225208
IN updated_at CHAR,
226209
IN count INT,
227210

228211
OUT affected_rows
229212
)
230213
BEGIN
231214

232-
DELETE FROM user_failed_login WHERE user_failed_login_id IN (:user_failed_login_id);
233-
234-
END
235-
236-
-- set role
215+
DELETE user_failed_login FROM user_failed_login
216+
INNER JOIN user.user_id ON user = user_failed_login.user_id
217+
WHERE
237218

238-
CREATE PROCEDURE setRole(
239-
IN user_failed_login_id INT,
240-
IN role CHAR,
241-
IN role_id INT
242-
OUT insert_id
243-
)
244-
BEGIN
245-
246-
247-
UPDATE user_failed_login
248-
249-
SET
250-
251-
@IF isset(:role_id)
252-
THEN
253-
role_id = :role_id
254-
END @IF
219+
@IF isset(:user_id) AND !empty(:user_id)
220+
THEN
221+
AND user_failed_login.user_id = :user_id
222+
END @IF
255223

224+
@IF isset(:username)
225+
THEN
226+
AND user.username = :username
227+
END @IF
256228

257-
@IF isset(:role)
258-
THEN
259-
role_id = (SELECT role_id FROM roles WHERE name = :role)
260-
END @IF
229+
@IF isset(:email)
230+
THEN
231+
AND user.email = :email
232+
END @IF
261233

262-
263-
WHERE user_failed_login_id = :user_failed_login_id
264-
END
234+
@IF isset(:user_id)
235+
THEN
236+
AND user.user_id IN (:user_id)
237+
END @IF
238+
239+
END

‎admin/sql/pgsql/admin_failed_login.sql

+29-54
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
CREATE PROCEDURE getAll(
66
IN start INT,
77
IN limit INT,
8-
IN user_id INT,
8+
IN admin_id INT,
99
IN count INT,
1010
IN updated_at CHAR,
1111

@@ -18,9 +18,9 @@
1818

1919
SELECT * FROM admin_failed_login WHERE 1 = 1
2020

21-
@IF isset(:user_id) AND !empty(:user_id)
21+
@IF isset(:admin_id) AND !empty(:admin_id)
2222
THEN
23-
AND admin_failed_login.user_id = :user_id
23+
AND admin_failed_login.admin_id = :admin_id
2424
END @IF
2525

2626
@IF isset(:count) AND !empty(:count)
@@ -44,13 +44,13 @@
4444
-- SELECT FOUND_ROWS() as count;
4545
SELECT count(*) FROM (
4646

47-
@SQL_COUNT(admin_failed_login.user_id, user) -- this takes previous query removes limit and replaces select columns with parameter user_id
47+
@SQL_COUNT(admin_failed_login.admin_id, admin) -- this takes previous query removes limit and replaces select columns with parameter admin_id
4848

4949
) as count;
5050

5151
END
5252

53-
-- get user information
53+
-- get admin information
5454

5555
CREATE PROCEDURE get(
5656
IN admin_id INT,
@@ -184,11 +184,8 @@
184184
-- Update admin_failed_login
185185

186186
CREATE PROCEDURE edit(
187-
IN user CHAR,
188-
IN email CHAR,
189-
IN admin_id INT,
187+
IN admin_id INT,
190188
IN admin_failed_login ARRAY,
191-
IN role_id INT,
192189
OUT affected_rows
193190
)
194191
BEGIN
@@ -199,65 +196,43 @@
199196

200197
SET @LIST(:admin_failed_login)
201198

202-
WHERE
199+
WHERE admin_id = :admin_id;
203200

204-
@IF isset(:email)
205-
THEN
206-
email = :email
207-
END @IF
208-
209-
@IF isset(:admin_failed_login_id)
210-
THEN
211-
admin_failed_login_id = :admin_failed_login_id
212-
END @IF
213-
214-
@IF isset(:username)
215-
THEN
216-
username = :username
217-
END @IF
218201
END
219202

220203
-- delete admin_failed_login
221204

222205
PROCEDURE delete(
223-
IN user_id INT,
206+
IN admin_id ARRAY,
224207
IN updated_at CHAR,
225208
IN count INT,
226209

227210
OUT affected_rows
228211
)
229212
BEGIN
230213

231-
DELETE FROM admin_failed_login WHERE admin_failed_login_id IN (:admin_failed_login_id);
232-
233-
END
234-
235-
-- set role
214+
DELETE admin_failed_login FROM admin_failed_login
215+
INNER JOIN admin.admin_id ON admin = admin_failed_login.admin_id
216+
WHERE
236217

237-
CREATE PROCEDURE setRole(
238-
IN admin_failed_login_id INT,
239-
IN role CHAR,
240-
IN role_id INT
241-
OUT insert_id
242-
)
243-
BEGIN
244-
245-
246-
UPDATE admin_failed_login
247-
248-
SET
249-
250-
@IF isset(:role_id)
251-
THEN
252-
role_id = :role_id
253-
END @IF
218+
@IF isset(:admin_id) AND !empty(:admin_id)
219+
THEN
220+
AND admin_failed_login.admin_id = :admin_id
221+
END @IF
254222

223+
@IF isset(:username)
224+
THEN
225+
AND admin.username = :username
226+
END @IF
255227

256-
@IF isset(:role)
257-
THEN
258-
role_id = (SELECT role_id FROM roles WHERE name = :role)
259-
END @IF
228+
@IF isset(:email)
229+
THEN
230+
AND admin.email = :email
231+
END @IF
260232

261-
262-
WHERE admin_failed_login_id = :admin_failed_login_id
263-
END
233+
@IF isset(:admin_id)
234+
THEN
235+
AND admin.admin_id IN (:admin_id)
236+
END @IF
237+
238+
END

0 commit comments

Comments
 (0)