Skip to content

Commit

Permalink
BS-232 Reverted changes made to SmsMessageFilter
Browse files Browse the repository at this point in the history
  • Loading branch information
@hrosa
hrosa committed Jun 8, 2018
1 parent 8bed8ee commit f84d178
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 150 deletions.
148 changes: 25 additions & 123 deletions restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/SmsMessageFilter.java
View file
Expand Up @@ -19,47 +19,36 @@
*/
package org.restcomm.connect.dao.entities;

import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.restcomm.connect.commons.annotations.concurrency.Immutable;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

import org.restcomm.connect.commons.annotations.concurrency.Immutable;

/**
* @author <a href="mailto:n.congvu@gmail.com">vunguyen</a>
* @author Henrique Rosa (henrique.rosa@telestax.com)
*/

@Immutable
public class SmsMessageFilter {

public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");

private String accountSid;
private List<String> accountSidSet; // if not-null we need the cdrs that belong to several accounts
private String recipient;
private String sender;
private String startTime; // to initialize it pass string arguments with yyyy-MM-dd format
private String endTime;
private String body;
private Integer limit;
private Integer offset;
private String instanceid;
private String smppMessageId;

private SmsMessageFilter() {
private final String accountSid;
private final List<String> accountSidSet; // if not-null we need the cdrs that belong to several accounts
private final String recipient;
private final String sender;
private final Date startTime; // to initialize it pass string arguments with yyyy-MM-dd format
private final Date endTime;
private final String body;
private final Integer limit;
private final Integer offset;
private final String instanceid;

}

@Deprecated
public SmsMessageFilter(String accountSid, List<String> accountSidSet, String recipient, String sender, String startTime, String endTime,
String body, Integer limit, Integer offset) throws ParseException {
this(accountSid, accountSidSet, recipient, sender, startTime, endTime, body, limit, offset, null);
this(accountSid, accountSidSet, recipient,sender,startTime,endTime, body, limit,offset,null);
}

@Deprecated
public SmsMessageFilter(String accountSid, List<String> accountSidSet, String recipient, String sender, String startTime, String endTime,
String body, Integer limit, Integer offset, String instanceId) throws ParseException {
this.accountSid = accountSid;
Expand All @@ -78,14 +67,16 @@ public SmsMessageFilter(String accountSid, List<String> accountSidSet, String re
this.limit = limit;
this.offset = offset;
if (startTime != null) {
//Date date = DATE_FORMAT.parse(startTime);
this.startTime = startTime;
SimpleDateFormat parser = new SimpleDateFormat("yyyy-MM-dd");
Date date = parser.parse(startTime);
this.startTime = date;
} else
this.startTime = null;

if (endTime != null) {
//Date date = DATE_FORMAT.parse(endTime);
this.endTime = endTime;
SimpleDateFormat parser = new SimpleDateFormat("yyyy-MM-dd");
Date date = parser.parse(endTime);
this.endTime = date;
} else {
this.endTime = null;
}
Expand All @@ -112,11 +103,11 @@ public String getSender() {
return sender;
}

public String getStartTime() {
public Date getStartTime() {
return startTime;
}

public String getEndTime() {
public Date getEndTime() {
return endTime;
}

Expand All @@ -132,94 +123,5 @@ public int getOffset() {
return offset;
}

public String getInstanceid() {
return instanceid;
}

public String getSmppMessageId() {
return smppMessageId;
}

public static Builder builer() {
return new Builder();
}

public static class Builder {

private final SmsMessageFilter filter;

private Builder() {
this.filter = new SmsMessageFilter();
this.filter.limit = 50;
this.filter.offset = 0;
}

public Builder accountSid(String accountSid) {
this.filter.accountSid = accountSid;
return this;
}

public Builder accountSidSet(List<String> accountSidSet) {
this.filter.accountSidSet = accountSidSet;
return this;
}

public Builder recipient(String recipient) {
if (recipient != null && !recipient.isEmpty()) {
this.filter.recipient = (recipient.startsWith("%") ? "" : "%") + this.filter.recipient;
}
return this;
}

public Builder sender(String sender) {
if (sender != null && !sender.isEmpty()) {
this.filter.sender = (sender.startsWith("%") ? "" : "%") + this.filter.sender;
}
return this;
}

public Builder startTime(DateTime startTime) {
if (startTime != null) {
this.filter.startTime = DATE_TIME_FORMATTER.print(startTime);
}
return this;
}

public Builder endTime(DateTime endTime) {
if (endTime != null) {
this.filter.endTime = DATE_TIME_FORMATTER.print(endTime);
}
return this;
}

public Builder body(String body) {
this.filter.body = body;
return this;
}

public Builder limit(int limit) {
this.filter.limit = limit;
return this;
}

public Builder offset(int offset) {
this.filter.offset = offset;
return this;
}

public Builder instanceId(String instanceId) {
this.filter.instanceid = instanceId;
return this;
}

public Builder smppMessageId(String smppMessageId) {
this.filter.smppMessageId = smppMessageId;
return this;
}

public SmsMessageFilter build() {
return this.filter;
}

}
}
public String getInstanceid() { return instanceid; }
}
13 changes: 1 addition & 12 deletions ...mm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisSmsMessagesDao.java
View file
Expand Up @@ -35,23 +35,12 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Currency;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import static org.restcomm.connect.dao.DaoUtils.readBigDecimal;
import static org.restcomm.connect.dao.DaoUtils.readCurrency;
import static org.restcomm.connect.dao.DaoUtils.readDateTime;
import static org.restcomm.connect.dao.DaoUtils.readSid;
import static org.restcomm.connect.dao.DaoUtils.readString;
import static org.restcomm.connect.dao.DaoUtils.readUri;
import static org.restcomm.connect.dao.DaoUtils.writeBigDecimal;
import static org.restcomm.connect.dao.DaoUtils.writeCurrency;
import static org.restcomm.connect.dao.DaoUtils.writeDateTime;
import static org.restcomm.connect.dao.DaoUtils.writeSid;
import static org.restcomm.connect.dao.DaoUtils.writeUri;
import static org.restcomm.connect.dao.DaoUtils.*;

/**
* @author quintana.thomas@gmail.com (Thomas Quintana)
Expand Down
24 changes: 10 additions & 14 deletions restcomm/restcomm.dao/src/test/java/org/restcomm/connect/dao/mybatis/SmsMessagesDaoTest.java
View file
Expand Up @@ -19,17 +19,6 @@
*/
package org.restcomm.connect.dao.mybatis;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import java.io.InputStream;
import java.math.BigDecimal;
import java.net.URI;
import java.text.ParseException;
import java.util.Calendar;
import java.util.Currency;
import java.util.List;

import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.session.SqlSessionFactoryBuilder;
import org.apache.log4j.Logger;
Expand All @@ -40,7 +29,16 @@
import org.restcomm.connect.commons.dao.Sid;
import org.restcomm.connect.dao.SmsMessagesDao;
import org.restcomm.connect.dao.entities.SmsMessage;
import org.restcomm.connect.dao.entities.SmsMessageFilter;

import java.io.InputStream;
import java.math.BigDecimal;
import java.net.URI;
import java.text.ParseException;
import java.util.Currency;
import java.util.List;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

/**
* @author quintana.thomas@gmail.com (Thomas Quintana)
Expand Down Expand Up @@ -264,8 +262,6 @@ public void testFindBySmppMessageIdAndDateCreatedGreaterOrEqualThanOrderedByDate
final SmsMessage smsMessage6 = createSms(accountSid, SmsMessage.Direction.OUTBOUND_API, 5, today, smppMessageId);
final SmsMessage smsMessage7 = createSms(accountSid, SmsMessage.Direction.OUTBOUND_API, 6, today, null);

final SmsMessageFilter filter = SmsMessageFilter.builer().accountSid(accountSid.toString()).smppMessageId(smppMessageId).startTime(threeDaysAgo).build();

// when
smsMessagesDao.addSmsMessage(smsMessage1);
smsMessagesDao.addSmsMessage(smsMessage2);
Expand Down
1 change: 0 additions & 1 deletion restcomm/restcomm.sms/src/main/java/org/restcomm/connect/sms/smpp/SmppMessageHandler.java
View file
Expand Up @@ -57,7 +57,6 @@
import org.restcomm.connect.dao.entities.IncomingPhoneNumber;
import org.restcomm.connect.dao.entities.Notification;
import org.restcomm.connect.dao.entities.SmsMessage;
import org.restcomm.connect.dao.entities.SmsMessageFilter;
import org.restcomm.connect.extension.api.ExtensionResponse;
import org.restcomm.connect.extension.api.ExtensionType;
import org.restcomm.connect.extension.api.IExtensionCreateSmsSessionRequest;
Expand Down

0 comments on commit f84d178

Please sign in to comment.