Skip to content

Commit 654b078

Browse files
author
Maria Farooq
committedApr 20, 2017
added org in account api response #2073 #2085
1 parent ffd43b6 commit 654b078

File tree

5 files changed

+35
-13
lines changed

5 files changed

+35
-13
lines changed
 

‎restcomm/restcomm.application/src/main/java/org/restcomm/connect/application/Bootstrapper.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.restcomm.connect.application.config.ConfigurationStringLookup;
1717
import org.restcomm.connect.commons.Version;
1818
import org.restcomm.connect.commons.configuration.RestcommConfiguration;
19+
import org.restcomm.connect.commons.dao.Sid;
1920
import org.restcomm.connect.commons.loader.ObjectFactory;
2021
import org.restcomm.connect.commons.loader.ObjectInstantiationException;
2122
import org.restcomm.connect.dao.DaoManager;
@@ -249,7 +250,7 @@ private void generateDefaultDomainName (final Configuration configuration, final
249250
final String hostname = configuration.getString("hostname");
250251
if(logger.isInfoEnabled())
251252
logger.info("Generate Default Domain Name based on RC hostname: "+hostname);
252-
Organization organization = storage.getOrganizationsDao().getOrganizationByDomainName("ORafbe225ad37541eba518a74248f0ac4c");
253+
Organization organization = storage.getOrganizationsDao().getOrganization(new Sid("ORafbe225ad37541eba518a74248f0ac4c"));
253254
if(organization != null){
254255
organization = organization.setDomainName(hostname);
255256
storage.getOrganizationsDao().updateOrganization(organization);

‎restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/OrganizationsDao.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ public interface OrganizationsDao {
3131
*
3232
* @param organization
3333
*/
34-
public void addOrganization(final Organization organization);
34+
void addOrganization(final Organization organization);
3535
/**
3636
* getOrganization by sid
3737
* @param sid
3838
* @return Organization entity
3939
*/
40-
public Organization getOrganization(final Sid sid);
40+
Organization getOrganization(final Sid sid);
4141
/**
4242
* updateOrganization
4343
* @param organization
4444
*/
45-
public void updateOrganization(final Organization organization);
45+
void updateOrganization(final Organization organization);
4646
}

‎restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/Account.java

+19-8
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ public final class Account {
4444
private final String authToken;
4545
private final String role;
4646
private final URI uri;
47+
private final Sid organizationSid;
4748

4849
public Account(final Sid sid, final DateTime dateCreated, final DateTime dateUpdated, final String emailAddress,
4950
final String friendlyName, final Sid parentSid, final Type type, final Status status, final String authToken,
50-
final String role, final URI uri) {
51+
final String role, final URI uri, final Sid organizationSid) {
5152
super();
5253
this.sid = sid;
5354
this.dateCreated = dateCreated;
@@ -60,6 +61,7 @@ public Account(final Sid sid, final DateTime dateCreated, final DateTime dateUpd
6061
this.authToken = authToken;
6162
this.role = role;
6263
this.uri = uri;
64+
this.organizationSid = organizationSid;
6365
}
6466

6567
public static Builder builder() {
@@ -110,34 +112,38 @@ public URI getUri() {
110112
return uri;
111113
}
112114

115+
public Sid getOrganizationSid() {
116+
return organizationSid;
117+
}
118+
113119
public Account setEmailAddress(final String emailAddress) {
114120
return new Account(sid, dateCreated, DateTime.now(), emailAddress, friendlyName, parentSid, type, status, authToken,
115-
role, uri);
121+
role, uri, organizationSid);
116122
}
117123

118124
public Account setFriendlyName(final String friendlyName) {
119125
return new Account(sid, dateCreated, DateTime.now(), emailAddress, friendlyName, parentSid, type, status, authToken,
120-
role, uri);
126+
role, uri, organizationSid);
121127
}
122128

123129
public Account setType(final Type type) {
124130
return new Account(sid, dateCreated, DateTime.now(), emailAddress, friendlyName, parentSid, type, status, authToken,
125-
role, uri);
131+
role, uri, organizationSid);
126132
}
127133

128134
public Account setStatus(final Status status) {
129135
return new Account(sid, dateCreated, DateTime.now(), emailAddress, friendlyName, parentSid, type, status, authToken,
130-
role, uri);
136+
role, uri, organizationSid);
131137
}
132138

133139
public Account setAuthToken(final String authToken) {
134140
return new Account(sid, dateCreated, DateTime.now(), emailAddress, friendlyName, parentSid, type, status, authToken,
135-
role, uri);
141+
role, uri, organizationSid);
136142
}
137143

138144
public Account setRole(final String role) {
139145
return new Account(sid, dateCreated, DateTime.now(), emailAddress, friendlyName, parentSid, type, status, authToken,
140-
role, uri);
146+
role, uri, organizationSid);
141147
}
142148

143149
public enum Status {
@@ -200,14 +206,15 @@ public static final class Builder {
200206
private String authToken;
201207
private String role;
202208
private URI uri;
209+
private Sid organizationSid;
203210

204211
private Builder() {
205212
super();
206213
}
207214

208215
public Account build() {
209216
final DateTime now = DateTime.now();
210-
return new Account(sid, now, now, emailAddress, friendlyName, parentSid, type, status, authToken, role, uri);
217+
return new Account(sid, now, now, emailAddress, friendlyName, parentSid, type, status, authToken, role, uri, organizationSid);
211218
}
212219

213220
public void setSid(final Sid sid) {
@@ -226,6 +233,10 @@ public void setParentSid(final Sid parentSid) {
226233
this.parentSid = parentSid;
227234
}
228235

236+
public void setOrganizationSid(final Sid organizationSid) {
237+
this.organizationSid = organizationSid;
238+
}
239+
229240
public void setType(final Type type) {
230241
this.type = type;
231242
}

‎restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisDaoManager.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,21 @@
3939
import org.restcomm.connect.dao.DaoManager;
4040
import org.restcomm.connect.dao.ExtensionsConfigurationDao;
4141
import org.restcomm.connect.dao.GatewaysDao;
42+
import org.restcomm.connect.dao.GeolocationDao;
4243
import org.restcomm.connect.dao.HttpCookiesDao;
4344
import org.restcomm.connect.dao.IncomingPhoneNumbersDao;
4445
import org.restcomm.connect.dao.InstanceIdDao;
4546
import org.restcomm.connect.dao.MediaResourceBrokerDao;
4647
import org.restcomm.connect.dao.MediaServersDao;
4748
import org.restcomm.connect.dao.NotificationsDao;
49+
import org.restcomm.connect.dao.OrganizationsDao;
4850
import org.restcomm.connect.dao.OutgoingCallerIdsDao;
4951
import org.restcomm.connect.dao.RecordingsDao;
5052
import org.restcomm.connect.dao.RegistrationsDao;
5153
import org.restcomm.connect.dao.ShortCodesDao;
5254
import org.restcomm.connect.dao.SmsMessagesDao;
5355
import org.restcomm.connect.dao.TranscriptionsDao;
5456
import org.restcomm.connect.dao.UsageDao;
55-
import org.restcomm.connect.dao.GeolocationDao;
5657

5758
/**
5859
* @author quintana.thomas@gmail.com (Thomas Quintana)
@@ -86,6 +87,7 @@ public final class MybatisDaoManager implements DaoManager {
8687
private MediaResourceBrokerDao mediaResourceBrokerDao;
8788
private ExtensionsConfigurationDao extensionsConfigurationDao;
8889
private GeolocationDao geolocationDao;
90+
private OrganizationsDao organizationsDao;
8991

9092
public MybatisDaoManager() {
9193
super();
@@ -213,6 +215,11 @@ public GeolocationDao getGeolocationDao() {
213215
return geolocationDao;
214216
}
215217

218+
@Override
219+
public OrganizationsDao getOrganizationsDao() {
220+
return organizationsDao;
221+
}
222+
216223
@Override
217224
public void shutdown() {
218225
// Nothing to do.
@@ -286,5 +293,6 @@ public void start(final SqlSessionFactory sessions) {
286293
mediaResourceBrokerDao = new MybatisMediaResourceBrokerDao(sessions);
287294
extensionsConfigurationDao = new MybatisExtensionsConfigurationDao(sessions);
288295
geolocationDao = new MybatisGeolocationDao(sessions);
296+
organizationsDao = new MybatisOrganizationDao(sessions);
289297
}
290298
}

‎restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/AccountConverter.java

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public void marshal(final Object object, final HierarchicalStreamWriter writer,
6767
writeDateUpdated(account.getDateUpdated(), writer);
6868
writeAuthToken(account, writer);
6969
writeUri(account.getUri(), writer);
70+
writeSid(account.getOrganizationSid(), writer);
7071
writeSubResourceUris(account, writer);
7172
writer.endNode();
7273
}
@@ -84,6 +85,7 @@ public JsonElement serialize(final Account account, final Type type, final JsonS
8485
writeDateUpdated(account.getDateUpdated(), object);
8586
writeAuthToken(account, object);
8687
writeUri(account, object);
88+
writeSid(account.getOrganizationSid(), object);
8789
writeSubResourceUris(account, object);
8890
return object;
8991
}

0 commit comments

Comments
 (0)