|
4 | 4 | import java.math.BigInteger; |
5 | 5 | import java.text.ParseException; |
6 | 6 | import java.util.ArrayList; |
7 | | -import java.util.Iterator; |
8 | 7 | import java.util.List; |
9 | 8 |
|
10 | 9 | import javax.servlet.http.HttpSession; |
11 | 10 |
|
12 | 11 | import com.fasterxml.jackson.core.JsonProcessingException; |
13 | 12 | import com.fasterxml.jackson.databind.ObjectMapper; |
14 | 13 | import com.intuit.ipp.core.Context; |
| 14 | +import com.intuit.ipp.core.IEntity; |
15 | 15 | import com.intuit.ipp.core.ServiceType; |
16 | 16 | import com.intuit.ipp.data.Account; |
17 | 17 | import com.intuit.ipp.data.AccountTypeEnum; |
|
27 | 27 | import com.intuit.ipp.data.ReferenceType; |
28 | 28 | import com.intuit.ipp.data.SalesItemLineDetail; |
29 | 29 | import com.intuit.ipp.security.OAuth2Authorizer; |
| 30 | +import com.intuit.ipp.services.QueryResult; |
30 | 31 | import com.intuit.ipp.util.Config; |
31 | 32 | import com.intuit.ipp.util.DateUtils; |
32 | 33 | import org.apache.commons.lang.StringUtils; |
|
52 | 53 | @Controller |
53 | 54 | public class JobsController { |
54 | 55 |
|
55 | | - public static final String MINOR_VERSION = "4"; |
| 56 | + private static final String MINOR_VERSION = "4"; |
| 57 | + |
| 58 | + private static final String ACCOUNT_QUERY = "select * from Account where AccountType='%s' maxresults 1"; |
56 | 59 |
|
57 | 60 | @Autowired |
58 | 61 | OAuth2PlatformClientFactory factory; |
@@ -246,17 +249,17 @@ private Estimate getEstimateWithMandatoryFields(Item item, Customer customer, Da |
246 | 249 | } |
247 | 250 |
|
248 | 251 | private Account findAccountByType(AccountTypeEnum accountTypeEnum, DataService service) throws FMSException { |
249 | | - final List<Account> accountList = service.findAll(new Account()); |
250 | 252 |
|
251 | | - final Iterator<Account> accountIterator = accountList.iterator(); |
| 253 | + final QueryResult queryResult = service.executeQuery(String.format(ACCOUNT_QUERY, accountTypeEnum.value())); |
| 254 | + |
| 255 | + final List<? extends IEntity> entities = queryResult.getEntities(); |
| 256 | + |
| 257 | + Account account = null; |
252 | 258 |
|
253 | | - while (accountIterator.hasNext()) { |
254 | | - final Account account = accountIterator.next(); |
255 | | - if(account.getAccountType() == accountTypeEnum) { |
256 | | - return account; |
257 | | - } |
| 259 | + if(!entities.isEmpty()) { |
| 260 | + account = (Account)entities.get(0); |
258 | 261 | } |
259 | | - return null; |
| 262 | + return account; |
260 | 263 | } |
261 | 264 |
|
262 | 265 | private Customer getCustomerWithMandatoryFields() { |
|
0 commit comments