Skip to content

Commit

Permalink
toListOfModel
Browse files Browse the repository at this point in the history
  • Loading branch information
@alex-inqwise
alex-inqwise committed Jan 10, 2024
1 parent ec00e6e commit 9ca43d8
Show file tree
Hide file tree
Showing 9 changed files with 94 additions and 104 deletions.
61 changes: 29 additions & 32 deletions opinion-facade/src/main/java/com/inqwise/opinion/facade/front/AccountsEntry.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.inqwise.opinion.opinion.facade.front;
package com.inqwise.opinion.facade.front;

import java.io.IOException;
import java.math.BigDecimal;
Expand All @@ -14,9 +14,13 @@
import org.json.JSONException;
import org.json.JSONObject;

import com.inqwise.opinion.common.IPostmasterContext;
import com.inqwise.opinion.common.IPostmasterObject;
import com.inqwise.opinion.common.opinions.IOpinion.JsonNames;
import com.inqwise.opinion.infrastructure.common.IOperationResult;
import com.inqwise.opinion.infrastructure.systemFramework.ApplicationLog;
import com.inqwise.opinion.infrastructure.systemFramework.DateConverter;
import com.inqwise.opinion.infrastructure.systemFramework.GeoIpManager;
import com.inqwise.opinion.infrastructure.systemFramework.JSONHelper;
import com.inqwise.opinion.library.common.IProduct;
import com.inqwise.opinion.library.common.accounts.AccountOperationsReferenceType;
Expand All @@ -42,14 +46,6 @@
import com.inqwise.opinion.library.managers.InvoicesManager;
import com.inqwise.opinion.library.managers.ProductsManager;
import com.inqwise.opinion.library.managers.ServicePackagesManager;
import com.inqwise.opinion.library.systemFramework.GeoIpManager;
import com.inqwise.opinion.opinion.common.IPostmasterContext;
import com.inqwise.opinion.opinion.common.IPostmasterObject;
import com.inqwise.opinion.opinion.common.opinions.IOpinion.JsonNames;

import net.casper.data.model.CDataCacheContainer;
import net.casper.data.model.CDataGridException;
import net.casper.data.model.CDataRowSet;

public class AccountsEntry extends Entry implements IPostmasterObject {
public AccountsEntry(IPostmasterContext context) {
Expand Down Expand Up @@ -188,7 +184,7 @@ public IDepositBounds getDebositBounds() {
return output;
}

public JSONObject getTransactions(JSONObject input) throws IOException, CDataGridException, JSONException, NullPointerException, ExecutionException{
public JSONObject getTransactions(JSONObject input) throws IOException, JSONException, NullPointerException, ExecutionException{
JSONObject output;
IOperationResult result = null;
IAccount account = null;
Expand Down Expand Up @@ -227,33 +223,33 @@ public JSONObject getTransactions(JSONObject input) throws IOException, CDataGri
}

if (null == result) {
CDataCacheContainer ds = AccountsOperationsManager
var rowSetArr = AccountsOperationsManager
.getAccountOperations(top, account.getId(),
accountOperationTypeIds, referenceId,
referenceTypeId, fromDate, toDate, true);
JSONArray ja = new JSONArray();
CDataRowSet rowSet = ds.getAll(null, true);
CDataRowSet invoicesRowSet = null;
JSONArray invoicesRowSetArr = null;
TreeMap<Date, JSONObject> groupsMap = null;
BigDecimal groupDebit = null;
BigDecimal groupCredit = null;
if (null != groupBy) {
groupDebit = new BigDecimal(0.0);
groupCredit = new BigDecimal(0.0);
invoicesRowSet = InvoicesManager.getInvoices(top, account.getId(),
InvoiceStatus.Open.getValue(), false).getAll();
invoicesRowSetArr = InvoicesManager.getInvoices(top, account.getId(),
InvoiceStatus.Open.getValue(), false);
groupsMap = new TreeMap<>();
}
JSONObject lastFundJo = null;
BigDecimal totalDebit = new BigDecimal(0.0);
BigDecimal totalCredit = new BigDecimal(0.0);
while (rowSet.next()) {
for (int i = 0; i < rowSetArr.length(); i++) {
var json = ja.getJSONObject(i);
JSONObject jTransaction = new JSONObject();

jTransaction.put("transactionId", rowSet.getLong("accop_id"));
Integer accountOperationTypeId = rowSet.getInt("accop_type_id");
jTransaction.put("transactionId", json.getLong("accop_id"));
Integer accountOperationTypeId = json.getInt("accop_type_id");
jTransaction.put("typeId", accountOperationTypeId);
Double amount = rowSet.getDouble("amount");
Double amount = json.getDouble("amount");
if (null != amount) {
jTransaction.put("amount", amount);
if (amount < 0) {
Expand All @@ -273,16 +269,16 @@ public JSONObject getTransactions(JSONObject input) throws IOException, CDataGri
jTransaction.put("debit", (amount < 0 ? -1.0 * amount : 0));
jTransaction.put("credit", (amount > 0 ? amount : 0));
}
Double balance = rowSet.getDouble("balance");
Double balance = json.getDouble("balance");
jTransaction.put("balance", balance);
Date modifyDate = account.addDateOffset(rowSet.getDate("modify_date"));
Date modifyDate = account.addDateOffset((Date)json.get("modify_date"));
jTransaction.put("modifyDate", JSONHelper.getDateFormat(modifyDate, "MMM dd, yyyy"));
Long accountOperationReferenceId = rowSet.getLong("reference_id");
Long accountOperationReferenceId = json.getLong("reference_id");
jTransaction.put("referenceId", accountOperationReferenceId);
jTransaction.put("comments", rowSet.getString("comments"));
jTransaction.put("creditCard",rowSet.getString("credit_card_number"));
jTransaction.put("creditCardTypeId",rowSet.getInt("credit_card_type_id"));
jTransaction.put("chargeDescription",rowSet.getString("charge_description"));
jTransaction.put("comments", json.getString("comments"));
jTransaction.put("creditCard",json.getString("credit_card_number"));
jTransaction.put("creditCardTypeId",json.getInt("credit_card_type_id"));
jTransaction.put("chargeDescription",json.getString("charge_description"));

if (null == groupsMap) {
ja.put(jTransaction);
Expand Down Expand Up @@ -318,19 +314,20 @@ public JSONObject getTransactions(JSONObject input) throws IOException, CDataGri
}

if (null == lastFundJo
&& rowSet.getInt("accop_type_id") == AccountsOperationsType.Fund.getValue()) {
&& json.getInt("accop_type_id") == AccountsOperationsType.Fund.getValue()) {
lastFundJo = jTransaction;
}
}

if(null != groupBy){
while (invoicesRowSet.next()) {
for (int i = 0; i < invoicesRowSetArr.length(); i++) {
var json = invoicesRowSetArr.getJSONObject(i);
JSONObject jInvoice = new JSONObject();
jInvoice.put("invoiceId",invoicesRowSet.getString("invoice_id"));
jInvoice.put("invoiceId",json.getString("invoice_id"));

Date groupDate = DateConverter
.shiftToTheEndOfTheMonth(account.addDateOffset(invoicesRowSet
.getDate("invoice_to_date")));
.shiftToTheEndOfTheMonth(account.addDateOffset((Date)json
.get("invoice_to_date")));
JSONObject jGroup = groupsMap.get(groupDate);
if (null == jGroup) {
jGroup = createJGroup(groupDate);
Expand Down Expand Up @@ -711,7 +708,7 @@ public JSONObject updateAccountSettings(JSONObject input) throws NullPointerExce

if(null == result){
Long accountId = account.getId();
result = com.inqwise.opinion.opinion.managers.AccountsManager.updateWelcomeMessageFlag(accountId, input.optBoolean(JsonNames.SHOW_WELCOME_MESSAGE, false), userId);
result = com.inqwise.opinion.managers.AccountsManager.updateWelcomeMessageFlag(accountId, input.optBoolean(JsonNames.SHOW_WELCOME_MESSAGE, false), userId);
}

if(result.hasError()){
Expand Down
28 changes: 9 additions & 19 deletions opinion-facade/src/main/java/com/inqwise/opinion/facade/front/ChargesEntry.java
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
package com.inqwise.opinion.opinion.facade.front;
package com.inqwise.opinion.facade.front;

import java.io.IOException;
import java.math.BigDecimal;
import java.util.List;
import java.util.concurrent.ExecutionException;

import net.casper.data.model.CDataCacheContainer;
import net.casper.data.model.CDataGridException;
import net.casper.data.model.CDataRowSet;
import net.casper.data.model.filters.CDataFilter;
import net.casper.data.model.filters.CDataFilterClause;
import net.casper.data.model.filters.EqualsFilter;

import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
Expand Down Expand Up @@ -80,7 +73,7 @@ public JSONObject getChargeDetails(JSONObject input) throws IOException, JSONExc
return output;
}

public JSONObject getCharges(JSONObject input) throws JSONException, CDataGridException, IOException, NullPointerException, ExecutionException{
public JSONObject getCharges(JSONObject input) throws JSONException, IOException, NullPointerException, ExecutionException{
JSONObject output;

IOperationResult result = null;
Expand Down Expand Up @@ -139,7 +132,7 @@ public static JSONObject getCharges(int top,
Long billId, Integer statusId, Boolean invoiced,
boolean isCalculateAmounts, List<Integer> statusIds,
IAccount account, Long userId, List<Long> chargesIds,
Integer billTypeId) throws CDataGridException, JSONException {
Integer billTypeId) throws JSONException {

IOperationResult result = null;
JSONObject output;
Expand All @@ -154,25 +147,22 @@ public static JSONObject getCharges(int top,
}

if(null == result){
CDataRowSet rowSet = ChargesManager.getCharges(top, account.getId(), billId, billTypeId,
var list = ChargesManager.getCharges(top, account.getId(), billId, billTypeId,
statusId, statusIds, false, invoiced, chargesIds);

JSONArray ja = new JSONArray();
BigDecimal totalAmountDue = BigDecimal.ZERO;
while(rowSet.next()){
Long chargeId = rowSet.getLong("charge_id");
BigDecimal amount = BigDecimal.valueOf(rowSet.getDouble("amount"));
int chargeStatusId = rowSet.getInt("charge_status_id");
if(chargeStatusId == ChargeStatus.Unpaid.getValue()){
totalAmountDue = totalAmountDue.add(amount);
for (var model : list) {
if(model.getStatus() == ChargeStatus.Unpaid){
totalAmountDue = totalAmountDue.add(BigDecimal.valueOf(model.getAmount()));
}
JSONObject jCharge = new JSONObject();
jCharge.put("chargeId", chargeId);
jCharge.put("chargeId", model.getId());
jCharge.put("statusId", chargeStatusId);
jCharge.put("name", rowSet.getString("charge_name"));
jCharge.put("description", rowSet.getString("charge_description"));
jCharge.put("chargeDate", JSONHelper.getDateFormat(account.addDateOffset(rowSet.getDate("insert_date")), "MMM dd, yyyy"));
jCharge.put("amount", amount);
jCharge.put("amount", model.getAmount());
ja.put(jCharge);
}

Expand Down
34 changes: 16 additions & 18 deletions opinion-facade/src/main/java/com/inqwise/opinion/facade/front/CintEntry.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.inqwise.opinion.opinion.facade.front;
package com.inqwise.opinion.facade.front;

import java.util.Calendar;
import java.util.Date;
Expand All @@ -11,19 +11,24 @@
import org.json.JSONException;
import org.json.JSONObject;

import com.cint.CintApiService;
import com.cint.OrderDetailsRequest;
import com.cint.OrderPurchaseRequest;
import com.cint.common.IOrder;
import com.cint.common.IOrderSubmit;
import com.cint.common.ITargetGroupSubmit;
import com.cint.common.OrderEventType;
import com.cint.common.errorHandle.CintOperationResult;
import com.inqwise.opinion.cint.CintApiService;
import com.inqwise.opinion.cint.OrderDetailsRequest;
import com.inqwise.opinion.cint.OrderPurchaseRequest;
import com.inqwise.opinion.cint.common.IOrder;
import com.inqwise.opinion.cint.common.IOrderSubmit;
import com.inqwise.opinion.cint.common.ITargetGroupSubmit;
import com.inqwise.opinion.cint.common.OrderEventType;
import com.inqwise.opinion.cint.common.errorHandle.CintOperationResult;
import com.inqwise.opinion.common.IPostmasterContext;
import com.inqwise.opinion.common.IPostmasterObject;
import com.inqwise.opinion.common.collectors.CollectorStatus;
import com.inqwise.opinion.common.collectors.ICollector;
import com.inqwise.opinion.common.collectors.IPanelSurveysCollector;
import com.inqwise.opinion.infrastructure.common.IOperationResult;
import com.inqwise.opinion.infrastructure.systemFramework.ApplicationLog;
import com.inqwise.opinion.infrastructure.systemFramework.Convert;
import com.inqwise.opinion.infrastructure.systemFramework.DateConverter;
import com.inqwise.opinion.infrastructure.systemFramework.NetworkHelper;
import com.inqwise.opinion.infrastructure.systemFramework.GeoIpManager;
import com.inqwise.opinion.library.common.accounts.IAccount;
import com.inqwise.opinion.library.common.errorHandle.BaseOperationResult;
import com.inqwise.opinion.library.common.errorHandle.ErrorCode;
Expand All @@ -36,14 +41,7 @@
import com.inqwise.opinion.library.common.users.IUser;
import com.inqwise.opinion.library.managers.ChargesManager;
import com.inqwise.opinion.library.managers.ProductsManager;
import com.inqwise.opinion.library.systemFramework.ApplicationConfiguration;
import com.inqwise.opinion.library.systemFramework.GeoIpManager;
import com.inqwise.opinion.opinion.common.IPostmasterContext;
import com.inqwise.opinion.opinion.common.IPostmasterObject;
import com.inqwise.opinion.opinion.common.collectors.CollectorStatus;
import com.inqwise.opinion.opinion.common.collectors.ICollector;
import com.inqwise.opinion.opinion.common.collectors.IPanelSurveysCollector;
import com.inqwise.opinion.opinion.managers.CollectorsManager;
import com.inqwise.opinion.managers.CollectorsManager;

public class CintEntry extends Entry implements IPostmasterObject {

Expand Down
7 changes: 3 additions & 4 deletions opinion-facade/src/main/java/com/inqwise/opinion/facade/front/ClientSessionDescryptor.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.inqwise.opinion.opinion.facade.front;
package com.inqwise.opinion.facade.front;

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.UUID;

import javax.servlet.http.Cookie;
Expand All @@ -11,13 +10,13 @@
import org.apache.commons.codec.binary.Base64;
import org.msgpack.MessagePack;

import com.inqwise.opinion.http.HttpClientSession;
import com.inqwise.opinion.http.HttpClientSessionUserArgs;
import com.inqwise.opinion.infrastructure.systemFramework.ApplicationLog;
import com.inqwise.opinion.infrastructure.systemFramework.NetworkHelper;
import com.inqwise.opinion.infrastructure.systemFramework.cryptography.StringEncrypter;
import com.inqwise.opinion.library.common.errorHandle.ErrorCode;
import com.inqwise.opinion.library.systemFramework.ApplicationConfiguration;
import com.inqwise.opinion.opinion.http.HttpClientSession;
import com.inqwise.opinion.opinion.http.HttpClientSessionUserArgs;

public class ClientSessionDescryptor {
static ApplicationLog logger = ApplicationLog
Expand Down
45 changes: 20 additions & 25 deletions opinion-facade/src/main/java/com/inqwise/opinion/facade/front/CollectorsEntry.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.inqwise.opinion.opinion.facade.front;
package com.inqwise.opinion.facade.front;

import java.io.IOException;
import java.text.Format;
Expand All @@ -9,10 +9,6 @@
import java.util.UUID;
import java.util.concurrent.ExecutionException;

import net.casper.data.model.CDataCacheContainer;
import net.casper.data.model.CDataGridException;
import net.casper.data.model.CDataRowSet;

import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
Expand All @@ -31,22 +27,22 @@
import com.inqwise.opinion.library.managers.ChargesManager;
import com.inqwise.opinion.library.managers.ProductsManager;
import com.inqwise.opinion.library.systemFramework.ApplicationConfiguration;
import com.inqwise.opinion.opinion.common.IPostmasterContext;
import com.inqwise.opinion.opinion.common.IPostmasterObject;
import com.inqwise.opinion.opinion.common.SurveyStatistics;
import com.inqwise.opinion.opinion.common.collectors.CollectorSourceType;
import com.inqwise.opinion.opinion.common.collectors.CollectorStatus;
import com.inqwise.opinion.opinion.common.collectors.ICollector;
import com.inqwise.opinion.opinion.common.collectors.ICollector.IMessagesExtension;
import com.inqwise.opinion.opinion.common.collectors.ICollector.JsonNames;
import com.inqwise.opinion.opinion.common.collectors.ICollector.ResultSetNames;
import com.inqwise.opinion.opinion.common.emails.ICollectLinkEmailData;
import com.inqwise.opinion.opinion.common.opinions.IOpinion;
import com.inqwise.opinion.opinion.common.opinions.ISurvey;
import com.inqwise.opinion.opinion.http.HttpClientSession;
import com.inqwise.opinion.opinion.managers.CollectorsManager;
import com.inqwise.opinion.opinion.managers.OpinionEmailsManager;
import com.inqwise.opinion.opinion.managers.OpinionsManager;
import com.inqwise.opinion.common.IPostmasterContext;
import com.inqwise.opinion.common.IPostmasterObject;
import com.inqwise.opinion.common.SurveyStatistics;
import com.inqwise.opinion.common.collectors.CollectorSourceType;
import com.inqwise.opinion.common.collectors.CollectorStatus;
import com.inqwise.opinion.common.collectors.ICollector;
import com.inqwise.opinion.common.collectors.ICollector.IMessagesExtension;
import com.inqwise.opinion.common.collectors.ICollector.JsonNames;
import com.inqwise.opinion.common.collectors.ICollector.ResultSetNames;
import com.inqwise.opinion.common.emails.ICollectLinkEmailData;
import com.inqwise.opinion.common.opinions.IOpinion;
import com.inqwise.opinion.common.opinions.ISurvey;
import com.inqwise.opinion.http.HttpClientSession;
import com.inqwise.opinion.managers.CollectorsManager;
import com.inqwise.opinion.managers.OpinionEmailsManager;
import com.inqwise.opinion.managers.OpinionsManager;

public class CollectorsEntry extends Entry implements IPostmasterObject {

Expand Down Expand Up @@ -258,7 +254,7 @@ public JSONObject deleteCollectors(JSONObject input) {
return output;
}

public JSONObject getCollectorDetails(JSONObject input) throws CDataGridException, JSONException, IOException, NullPointerException, ExecutionException {
public JSONObject getCollectorDetails(JSONObject input) throws JSONException, IOException, NullPointerException, ExecutionException {
JSONObject output = new JSONObject();
IOperationResult result = validateSignIn();
Long collectorId = JSONHelper.optLong(input, JsonNames.COLLECTOR_ID);
Expand Down Expand Up @@ -320,8 +316,7 @@ public JSONObject getCollectorDetails(JSONObject input) throws CDataGridExceptio
}

if (null == result && collector.getCollectorStatus() == CollectorStatus.PendingPayment) {
CDataCacheContainer dataSet = ChargesManager.getChargesByReferenceId(account.getId(), collectorId, ChargeReferenceType.Collector.getValue());
CDataRowSet rowSet = dataSet.getAll();
JSONArray arr = ChargesManager.getChargesByReferenceId(account.getId(), collectorId, ChargeReferenceType.Collector.getValue());
if(rowSet.next()){
JSONObject chargeJO = new JSONObject();
chargeJO.put("chargeId",rowSet.getLong("charge_id"));
Expand Down Expand Up @@ -389,7 +384,7 @@ public JSONObject deleteCollector(JSONObject input) {
return output;
}

public JSONObject getCollectors(JSONObject input) throws CDataGridException, JSONException, IOException, NullPointerException, ExecutionException{
public JSONObject getCollectors(JSONObject input) throws JSONException, IOException, NullPointerException, ExecutionException{
JSONObject output;

IOperationResult result = validateSignIn();
Expand Down
4 changes: 4 additions & 0 deletions opinion-infrastructure/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@
<groupId>com.maxmind.db</groupId>
<artifactId>maxmind-db</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down
Loading

0 comments on commit 9ca43d8

Please sign in to comment.