Skip to content

Commit ff3c2b5

Browse files
VladislavKostyukevichVladislavKostyukevich
committed
Fix for settings
1 parent 90bab6b commit ff3c2b5

File tree

7 files changed

+169
-3
lines changed

7 files changed

+169
-3
lines changed

‎src/main/java/main/model/db/dao/DAO.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public T update(T entity) throws AqualityException {
113113
try {
114114
getEntityById(entity.getId());
115115
} catch (AqualityException e) {
116-
throw new AqualityParametersException("Entity with specified id does not exist!");
116+
throw new AqualityParametersException("Entity with specified '%s' id does not exist!", entity.getId());
117117
}
118118

119119
List<Pair<String, String>> parameters = entity.getParameters();

‎src/main/java/main/model/db/dao/settings/AppSettingsDao.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ public class AppSettingsDao extends DAO<AppSettingsDto> {
88
public AppSettingsDao(){
99
super(AppSettingsDto.class);
1010
insert = "{call INSERT_APP_SETTINGS(?,?,?,?)}";
11-
select = "{call SELECT_APP_SETTINGS()}";
11+
select = "{call SELECT_APP_SETTINGS(?)}";
1212
}
1313
}

‎src/main/java/main/model/db/dao/settings/LdapDao.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
public class LdapDao extends DAO<LdapDto>{
77
public LdapDao() {
88
super(LdapDto.class);
9-
select = "{call SELECT_LDAP_SETTING()}";
9+
select = "{call SELECT_LDAP_SETTING(?)}";
1010
insert = "{call INSERT_LDAP_SETTING(?,?,?,?,?,?,?,?,?,?,?,?)}";
1111
}
1212
}

‎src/main/java/main/model/dto/AppSettingsDto.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
public class AppSettingsDto extends BaseDto{
99
@DataBaseName(name = "request_id")
1010
@DataBaseInsert
11+
@DataBaseSearchable
1112
private Integer id;
1213
@DataBaseName(name = "request_ldap_auth")
1314
@DataBaseInsert

‎src/main/java/main/model/dto/LdapDto.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public class LdapDto extends BaseDto {
4040
@DataBaseInsert
4141
private String adminSecret;
4242
@DataBaseName(name="request_id")
43+
@DataBaseSearchable
4344
@DataBaseInsert
4445
private Integer id;
4546
}

‎src/main/resources/db_changelog/changelog.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@
3030
<include file="db.changelog-0.3.5.xml" relativeToChangelogFile="true"/>
3131
<include file="db.changelog-0.3.6.xml" relativeToChangelogFile="true"/>
3232
<include file="db.changelog-0.3.7.xml" relativeToChangelogFile="true"/>
33+
<include file="db.changelog-0.3.8.xml" relativeToChangelogFile="true"/>
3334
</databaseChangeLog>

‎src/main/resources/db_changelog/db.changelog-0.3.8.xml‎

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<databaseChangeLog
3+
xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
6+
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
7+
8+
9+
<changeSet id="Update SELECT_LDAP_SETTING to use id" author="v.kostyukevich">
10+
<sql endDelimiter="#">
11+
12+
DROP procedure IF EXISTS `SELECT_LDAP_SETTING`;
13+
14+
#
15+
16+
CREATE PROCEDURE `SELECT_LDAP_SETTING`(
17+
IN request_id VARCHAR(10)
18+
)
19+
BEGIN
20+
SELECT * FROM ldap_settings where empty_or_equal(request_id, id);
21+
END
22+
</sql>
23+
<rollback>
24+
DROP procedure IF EXISTS `SELECT_LDAP_SETTING`;
25+
#
26+
CREATE PROCEDURE `SELECT_LDAP_SETTING`()
27+
BEGIN
28+
SELECT * FROM ldap_settings;
29+
END
30+
</rollback>
31+
</changeSet>
32+
33+
<changeSet id="Update SELECT_APP_SETTINGS to use id" author="v.kostyukevich">
34+
<sql endDelimiter="#">
35+
36+
DROP procedure IF EXISTS `SELECT_APP_SETTINGS`;
37+
38+
#
39+
40+
CREATE PROCEDURE `SELECT_APP_SETTINGS`(
41+
IN request_id VARCHAR(10)
42+
)
43+
BEGIN
44+
SELECT * FROM app_settings where empty_or_equal(request_id, id);
45+
END
46+
</sql>
47+
<rollback>
48+
DROP procedure IF EXISTS `SELECT_APP_SETTINGS`;
49+
#
50+
CREATE PROCEDURE `SELECT_APP_SETTINGS`()
51+
BEGIN
52+
SELECT * FROM app_settings;
53+
END
54+
</rollback>
55+
</changeSet>
56+
57+
<changeSet id="Update INSERT_LDAP_SETTING to return result" author="v.kostyukevich">
58+
<sql endDelimiter="#">
59+
60+
DROP procedure IF EXISTS `INSERT_LDAP_SETTING`;
61+
62+
#
63+
64+
CREATE PROCEDURE `INSERT_LDAP_SETTING`(
65+
In request_ldapAdServer varchar(300),
66+
IN request_ldapSearchBaseUsers VARCHAR(300),
67+
IN request_security_auntification VARCHAR(45),
68+
IN request_userSearchFilter VARCHAR(300),
69+
IN request_domain VARCHAR(300),
70+
IN request_mailAttribute VARCHAR(45),
71+
IN request_firstNameAttribute VARCHAR(45),
72+
IN request_lastNameAttribute VARCHAR(45),
73+
IN request_userNameAttribute VARCHAR(45),
74+
IN request_adminUserName VARCHAR(150),
75+
IN request_adminSecret VARCHAR(300),
76+
IN request_id VARCHAR(11))
77+
BEGIN
78+
79+
INSERT INTO ldap_settings (ldapAdServer,ldapSearchBaseUsers,security_auntification,userSearchFilter,domain,mailAttribute,firstNameAttribute,lastNameAttribute,userNameAttribute,id,adminUserName,adminSecret)
80+
VALUES (
81+
request_ldapAdServer,
82+
request_ldapSearchBaseUsers,
83+
request_security_auntification,
84+
request_userSearchFilter,
85+
request_domain,
86+
request_mailAttribute,
87+
request_firstNameAttribute,
88+
request_lastNameAttribute,
89+
request_userNameAttribute,
90+
request_id,
91+
request_adminUserName,
92+
request_adminSecret
93+
)
94+
ON DUPLICATE KEY UPDATE
95+
ldapAdServer= IF(request_ldapAdServer = '', ldapAdServer, request_ldapAdServer),
96+
ldapSearchBaseUsers = IF(request_ldapSearchBaseUsers = '', ldapSearchBaseUsers, request_ldapSearchBaseUsers),
97+
security_auntification = IF(request_security_auntification = '', security_auntification, request_security_auntification),
98+
userSearchFilter = IF(request_userSearchFilter = '', userSearchFilter, request_userSearchFilter),
99+
domain = IF(request_domain = '', domain, request_domain),
100+
mailAttribute = IF(request_mailAttribute = '', mailAttribute, request_mailAttribute),
101+
firstNameAttribute = IF(request_firstNameAttribute='', firstNameAttribute, request_firstNameAttribute),
102+
lastNameAttribute = IF(request_lastNameAttribute='', lastNameAttribute, request_lastNameAttribute),
103+
userNameAttribute = IF(request_userNameAttribute='', userNameAttribute, request_userNameAttribute),
104+
adminUserName = IF(request_adminUserName='', adminUserName, request_adminUserName),
105+
adminSecret = IF(request_adminSecret='', adminSecret, request_adminSecret)
106+
;
107+
108+
SET @result_id = IF(request_id = '', LAST_INSERT_ID(), request_id);
109+
SELECT * from ldap_settings where id = @result_id;
110+
111+
END
112+
</sql>
113+
<rollback>
114+
DROP procedure IF EXISTS `INSERT_LDAP_SETTING`;
115+
#
116+
CREATE PROCEDURE `INSERT_LDAP_SETTING`(
117+
In request_ldapAdServer varchar(300),
118+
IN request_ldapSearchBaseUsers VARCHAR(300),
119+
IN request_security_auntification VARCHAR(45),
120+
IN request_userSearchFilter VARCHAR(300),
121+
IN request_domain VARCHAR(300),
122+
IN request_mailAttribute VARCHAR(45),
123+
IN request_firstNameAttribute VARCHAR(45),
124+
IN request_lastNameAttribute VARCHAR(45),
125+
IN request_userNameAttribute VARCHAR(45),
126+
IN request_adminUserName VARCHAR(150),
127+
IN request_adminSecret VARCHAR(300),
128+
IN request_id VARCHAR(11))
129+
BEGIN
130+
131+
INSERT INTO ldap_settings (ldapAdServer,ldapSearchBaseUsers,security_auntification,userSearchFilter,domain,mailAttribute,firstNameAttribute,lastNameAttribute,userNameAttribute,id,adminUserName,adminSecret)
132+
VALUES (
133+
request_ldapAdServer,
134+
request_ldapSearchBaseUsers,
135+
request_security_auntification,
136+
request_userSearchFilter,
137+
request_domain,
138+
request_mailAttribute,
139+
request_firstNameAttribute,
140+
request_lastNameAttribute,
141+
request_userNameAttribute,
142+
request_id,
143+
request_adminUserName,
144+
request_adminSecret
145+
)
146+
ON DUPLICATE KEY UPDATE
147+
ldapAdServer= IF(request_ldapAdServer = '', ldapAdServer, request_ldapAdServer),
148+
ldapSearchBaseUsers = IF(request_ldapSearchBaseUsers = '', ldapSearchBaseUsers, request_ldapSearchBaseUsers),
149+
security_auntification = IF(request_security_auntification = '', security_auntification, request_security_auntification),
150+
userSearchFilter = IF(request_userSearchFilter = '', userSearchFilter, request_userSearchFilter),
151+
domain = IF(request_domain = '', domain, request_domain),
152+
mailAttribute = IF(request_mailAttribute = '', mailAttribute, request_mailAttribute),
153+
firstNameAttribute = IF(request_firstNameAttribute='', firstNameAttribute, request_firstNameAttribute),
154+
lastNameAttribute = IF(request_lastNameAttribute='', lastNameAttribute, request_lastNameAttribute),
155+
userNameAttribute = IF(request_userNameAttribute='', userNameAttribute, request_userNameAttribute),
156+
adminUserName = IF(request_adminUserName='', adminUserName, request_adminUserName),
157+
adminSecret = IF(request_adminSecret='', adminSecret, request_adminSecret)
158+
;
159+
END
160+
</rollback>
161+
</changeSet>
162+
163+
</databaseChangeLog>

0 commit comments

Comments
 (0)