Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get countries statistics #11

Merged
merged 3 commits into from
Jan 14, 2024
Merged

Get countries statistics #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76c5dcd
countries statistics sup
xXkoshmarikXx Jan 14, 2024
eaf516e
Merge branch 'master' into getCountriesStatistics
xXkoshmarikXx Jan 14, 2024
3e7f5f8
collector model sup
xXkoshmarikXx Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions opinion-app-admin/src/main/webapp/com/inqwise/opinion/handlers/AccountsEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,13 @@
import org.json.JSONException;
import org.json.JSONObject;

import com.inqwise.opinion.common.IOpinionAccount;
import com.inqwise.opinion.common.IPostmasterContext;
import com.inqwise.opinion.infrastructure.common.BulkOperationResults;
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.AccountModel;
Expand All @@ -50,9 +53,6 @@
import com.inqwise.opinion.library.managers.ParametersManager;
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.common.IOpinionAccount;
import com.inqwise.opinion.common.IPostmasterContext;

import net.casper.data.model.CDataCacheContainer;
import net.casper.data.model.CDataGridException;
Expand Down
22 changes: 10 additions & 12 deletions opinion-app-admin/src/main/webapp/com/inqwise/opinion/handlers/CollectorsEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,17 @@
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.opinions.IOpinion;
import com.inqwise.opinion.common.opinions.ISurvey;
import com.inqwise.opinion.infrastructure.systemFramework.ApplicationLog;
import com.inqwise.opinion.infrastructure.systemFramework.JSONHelper;
import com.inqwise.opinion.library.common.IProduct;
import com.inqwise.opinion.library.common.accounts.AccountModel;
import com.inqwise.opinion.library.common.accounts.IAccount;
import com.inqwise.opinion.library.common.errorHandle.BaseOperationResult;
import com.inqwise.opinion.library.common.errorHandle.ErrorCode;
import com.inqwise.opinion.library.common.errorHandle.OperationResult;
import com.inqwise.opinion.library.common.pay.ChargeModel;
import com.inqwise.opinion.library.common.pay.ChargeReferenceType;
import com.inqwise.opinion.library.managers.AccountsManager;
import com.inqwise.opinion.library.managers.ChargesManager;
Expand All @@ -36,10 +37,6 @@
import com.inqwise.opinion.managers.CollectorsManager;
import com.inqwise.opinion.managers.OpinionsManager;

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

public class CollectorsEntry extends Entry {

static ApplicationLog logger = ApplicationLog.getLogger(CollectorsEntry.class);
Expand All @@ -48,7 +45,7 @@ protected CollectorsEntry(IPostmasterContext context) {
super(context);
}

public JSONObject getCollectors(JSONObject input) throws CDataGridException, JSONException{
public JSONObject getCollectors(JSONObject input) throws JSONException{
JSONObject output;
int top = JSONHelper.optInt(input, "top", 100);
Long opinionId = JSONHelper.optLong(input, "opinionId");
Expand Down Expand Up @@ -205,13 +202,14 @@ public JSONObject getCollectorDetails(JSONObject input) {
}

if (null == result && collector.getCollectorSourceType() == CollectorSourceType.BuyRespondents) {
CDataCacheContainer dataSet = ChargesManager.getChargesByReferenceId(null, collectorId, ChargeReferenceType.Collector.getValue());
CDataRowSet rowSet = dataSet.getAll();
if(rowSet.next()){
List<ChargeModel> list = ChargesManager.getChargesByReferenceId(null, collectorId, ChargeReferenceType.Collector.getValue());
if(list.size() > 0){
var firstModel = list.get(0);
JSONObject chargeJO = new JSONObject();
chargeJO.put("chargeId",rowSet.getLong("charge_id"));
chargeJO.put("chargeId",firstModel.getId());

if(collector.getCollectorStatus() == CollectorStatus.PendingPayment){
chargeJO.put("amountDue", rowSet.getDouble("amount"));
chargeJO.put("amountDue", firstModel.getAmount());
}
output.put("charge", chargeJO);
}
Expand Down Expand Up @@ -282,7 +280,7 @@ public JSONObject deleteCollector(JSONObject input) {

if(null == result){
Long collectorId = JSONHelper.optLong(input,
JsonNames.COLLECTOR_ID);
ICollector.JsonNames.COLLECTOR_ID);
BaseOperationResult deleteResult = CollectorsManager
.delete(collectorId, null, userId);
if (deleteResult.hasError()) {
Expand Down
4 changes: 2 additions & 2 deletions opinion-app-admin/src/main/webapp/com/inqwise/opinion/handlers/Entry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.inqwise.opinion.handlers;

import com.inqwise.opinion.opinion.common.IPostmasterContext;
import com.inqwise.opinion.opinion.common.IPostmasterObject;
import com.inqwise.opinion.common.IPostmasterContext;
import com.inqwise.opinion.common.IPostmasterObject;

public abstract class Entry implements IPostmasterObject {
//static ApplicationLog logger = ApplicationLog.getLogger(Entry.class);
Expand Down
58 changes: 28 additions & 30 deletions opinion-facade/src/main/java/com/inqwise/opinion/facade/front/CollectorsEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@
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.SurveyStatistics;
import com.inqwise.opinion.common.collectors.CollectorModel;
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.emails.ICollectLinkEmailData;
import com.inqwise.opinion.common.opinions.IOpinion;
import com.inqwise.opinion.common.opinions.ISurvey;
import com.inqwise.opinion.infrastructure.common.IOperationResult;
import com.inqwise.opinion.infrastructure.systemFramework.ApplicationLog;
import com.inqwise.opinion.infrastructure.systemFramework.JSONHelper;
Expand All @@ -27,19 +39,6 @@
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.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;
Expand Down Expand Up @@ -406,37 +405,36 @@ public JSONObject getCollectors(JSONObject input) throws JSONException, IOExcept
Date fromDate = JSONHelper.optDate(input, "fromDate");
Date toDate = JSONHelper.optDate(input, "toDate");

CDataCacheContainer ds = CollectorsManager.getMeny(opinionId, account.getId(), false, top, fromDate, toDate, null, null);
List<CollectorModel> cList = CollectorsManager.getMeny(opinionId, account.getId(), false, top, fromDate, toDate, null, null);
JSONArray ja = new JSONArray();
CDataRowSet rowSet = ds.getAll();
Format formatter = new SimpleDateFormat(
"MMM dd, yyyy HH:mm:ss");
while(rowSet.next()){
for (var collectorModel : cList){
JSONObject jo = new JSONObject();
Long collectorId = rowSet.getLong(ResultSetNames.COLLECTOR_ID);
Long collectorId = collectorModel.getId();
jo.put(JsonNames.COLLECTOR_ID, collectorId);
jo.put(JsonNames.OPINION_ID, rowSet.getLong(ResultSetNames.OPINION_ID));
long actualAccountId = rowSet.getLong(ResultSetNames.ACCOUNT_ID);
jo.put(JsonNames.COLLECTOR_UUID, rowSet.getString(ResultSetNames.COLLECTOR_UUID));
jo.put(JsonNames.NAME, rowSet.getString(ResultSetNames.COLLECTOR_NAME));
Integer statusId = rowSet.getInt(ResultSetNames.COLLECTOR_STATUS_ID);
jo.put(JsonNames.OPINION_ID, collectorModel.getOpinionId());
long actualAccountId = collectorModel.getAccountId();
jo.put(JsonNames.COLLECTOR_UUID, collectorModel.getCollectorUuid());
jo.put(JsonNames.NAME, collectorModel.getCollectorName());
Integer statusId = collectorModel.getCollectorStatusId();
jo.put(JsonNames.STATUS_ID, statusId);
jo.put(JsonNames.SOURCE_TYPE_ID, rowSet.getInt(ResultSetNames.COLLECTOR_SOURCE_TYPE_ID));
jo.put(JsonNames.SOURCE_TYPE_ID, collectorModel.getCollectorSourceTypeId());

long cntStarted = rowSet.getLong(ResultSetNames.CNT_STARTED_OPINIONS);
long cntCompleted = rowSet.getLong(ResultSetNames.CNT_FINISHED_OPINIONS);
long cntStarted = collectorModel.getCntStartedOpinions();
long cntCompleted = collectorModel.getCntFinishedOpinions();
jo.put(JsonNames.STARTED_RESPONSES, cntStarted);
jo.put(JsonNames.FINISHED_RESPONSES, cntCompleted);
jo.put(JsonNames.PARTIAL_RESPONSES, cntStarted - cntCompleted);
jo.put(JsonNames.COMPLETION_RATE, (cntStarted > 0 ? Math.round((cntCompleted * 1d / cntStarted * 1d) * 100.0) : 0));

if(null != rowSet.getDate(ResultSetNames.LAST_START_DATE)){
jo.put(JsonNames.LAST_RESPONSE_DATE, formatter.format(rowSet.getDate(ResultSetNames.LAST_START_DATE)));
if(null != collectorModel.getLastStartDate()){
jo.put(JsonNames.LAST_RESPONSE_DATE, formatter.format(collectorModel.getLastStartDate()));
}
jo.put(JsonNames.CLOSE_MESSAGE, rowSet.getString(ResultSetNames.CLOSE_MESSAGE));
jo.put(JsonNames.CLOSE_MESSAGE, collectorModel.getCloseMessage());

if(null != rowSet.getDouble(ICollector.ResultSetNames.AVG_TIME_TAKEN_SEC)){
jo.put(ICollector.JsonNames.TIME_TAKEN, JSONHelper.getTimeSpanSec(Math.round(rowSet.getDouble(ICollector.ResultSetNames.AVG_TIME_TAKEN_SEC))));
if(null != collectorModel.getAvgTimeTakenSec()){
jo.put(ICollector.JsonNames.TIME_TAKEN, JSONHelper.getTimeSpanSec(Math.round(collectorModel.getAvgTimeTakenSec())));
}

if (statusId == CollectorStatus.PendingPayment.getValue()) {
Expand Down
19 changes: 9 additions & 10 deletions opinion-facade/src/main/java/com/inqwise/opinion/facade/front/ResponsesEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.json.JSONObject;

import com.inqwise.opinion.common.AnswererSessionModel;
import com.inqwise.opinion.common.CountriesStatisticsModel;
import com.inqwise.opinion.common.IAnswererSession;
import com.inqwise.opinion.common.IPostmasterContext;
import com.inqwise.opinion.common.IPostmasterObject;
Expand Down Expand Up @@ -196,7 +197,6 @@ public JSONObject getAnswererResults(JSONObject input) throws IOException, JSONE

boolean includePartialAnswers = includePartial;
boolean includePartialStatistics = includePartial;
Long sheetId = JSONHelper.optLong(input, "sheetId");

OperationResult<List<IAnalizeControl>> controlsResult = ResultsManager
.getAnalizeControls(opinionId, account.getId(), answererSessionId, collectorId, includePartialAnswers, includePartialStatistics, true);
Expand Down Expand Up @@ -347,25 +347,24 @@ public JSONObject getCountriesStatistics(JSONObject input) throws NullPointerExc
}

if(null == result){
CDataCacheContainer opinionsDataSet = ResultsManager.getCountriesStatistics(opinionId, account.getId(), account.removeDateOffset(from), account.removeDateOffset(to), collectorId, includePartial);
CDataRowSet rowSet = opinionsDataSet.getAll();
List<CountriesStatisticsModel> countriesStatisticsList = ResultsManager.getCountriesStatistics(opinionId, account.getId(), account.removeDateOffset(from), account.removeDateOffset(to), collectorId, includePartial);
JSONArray ja = new JSONArray();

while(rowSet.next()){
for(var countriesStatisticsModel : countriesStatisticsList){
JSONObject item = new JSONObject();
Integer countryId = (rowSet.getInt("country_id"));
Integer countryId = (countriesStatisticsModel.getCountryId());

if(null == countryId){
item.put("countryName", "Other");
item.put("iso2", "oo");
} else {
item.put("countryId", countryId);
item.put("countryName", rowSet.getString("country_name"));
item.put("iso2", rowSet.getString("iso2").toLowerCase());
item.put("countryName", countriesStatisticsModel.getCountryName());
item.put("iso2", countriesStatisticsModel.getIso2());
}
Long timeTakenSec = rowSet.getLong("time_taken_sec");
Long cntStarted = rowSet.getLong("started");
Long cntCompleted = rowSet.getLong("completed");
Long timeTakenSec = countriesStatisticsModel.getTimeTakenSec();
Long cntStarted = countriesStatisticsModel.getCntStarted();
Long cntCompleted = countriesStatisticsModel.getCntCompleted();
Long cntPartial = cntStarted - cntCompleted;
item.put("started", cntStarted);
item.put("completed", cntCompleted);
Expand Down
35 changes: 0 additions & 35 deletions opinion-infrastructure/src/main/java/com/inqwise/opinion/infrastructure/dao/Resultsets.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...-library-core/src/main/java/com/inqwise/opinion/library/common/accounts/AccountModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.inqwise.opinion.library.common.accounts;

import java.util.Collection;
import java.util.Date;

import org.json.JSONObject;

import com.google.common.base.MoreObjects;

public class AccountModel {
Expand Down
Loading
Loading