Skip to content

Commit f13523b

Browse files
TesterTester
Tester
authored and
Tester
committed
style checks
1 parent cabcfe2 commit f13523b

File tree

3 files changed

+29
-44
lines changed

3 files changed

+29
-44
lines changed

‎src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ public interface TransactionRepository {
3333
List<Transaction> getTransactions(TransactionQueryForm form);
3434

3535
void writeTransactionsCSV(TransactionQueryForm form, Writer writer);
36-
void writeTransactionsDetailsCSV(int transactionPk, Writer writer,
36+
37+
void writeTransactionsDetailsCSV(int transactionPk, Writer writer,
3738
boolean dataReduction, boolean firstArrivingMeterValueIfMultiple);
3839

3940
List<Integer> getActiveTransactionIds(String chargeBoxId);

‎src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,13 @@ public void writeTransactionsCSV(TransactionQueryForm form, Writer writer) {
8383
@Override
8484
public void writeTransactionsDetailsCSV(int transactionPk, Writer writer,
8585
boolean dataReduction, boolean firstArrivingMeterValueIfMultiple) {
86-
87-
// write a few information about the transaction
86+
// write a few information about the transaction
8887
TransactionQueryForm form = new TransactionQueryForm();
8988
form.setTransactionPk(transactionPk);
9089
form.setType(TransactionQueryForm.QueryType.ALL);
9190
form.setPeriodType(TransactionQueryForm.QueryPeriodType.ALL);
92-
9391
//getInternalCSV(form).fetch().formatCSV(writer);
94-
95-
Record12<Integer, String, Integer, String, DateTime, String, DateTime,
92+
Record12<Integer, String, Integer, String, DateTime, String, DateTime,
9693
String, String, Integer, Integer, TransactionStopEventActor>
9794
res = getInternal(form).fetchOne();
9895
if (res == null) {
@@ -117,32 +114,29 @@ public List<Integer> getActiveTransactionIds(String chargeBoxId) {
117114
}
118115

119116
@Override
120-
public TransactionDetails getDetails(int transactionPk,
117+
public TransactionDetails getDetails(int transactionPk,
121118
boolean dataReduction, boolean firstArrivingMeterValueIfMultiple) {
122-
123119
// -------------------------------------------------------------------------
124120
// Step 1: Collect general data about transaction
125121
// -------------------------------------------------------------------------
126-
122+
//
127123
TransactionQueryForm form = new TransactionQueryForm();
128124
form.setTransactionPk(transactionPk);
129125
form.setType(TransactionQueryForm.QueryType.ALL);
130126
form.setPeriodType(TransactionQueryForm.QueryPeriodType.ALL);
131127

132-
Record12<Integer, String, Integer, String, DateTime, String, DateTime,
128+
Record12<Integer, String, Integer, String, DateTime, String, DateTime,
133129
String, String, Integer, Integer, TransactionStopEventActor>
134130
res = getInternal(form).fetchOne();
135131

136132
if (res == null) {
137133
throw new SteveException("There is no transaction with id '%s'", transactionPk);
138134
}
139-
140135
//Transaction transaction = getInternal(form).fetchOne(new TransactionMapper());
141136
TransactionMapper mapper = new TransactionMapper();
142137
Transaction transaction = mapper.map(res);
143138
TransactionStartRecord nextTx = null;
144-
145-
List<TransactionDetails.MeterValues> values =
139+
List<TransactionDetails.MeterValues> values =
146140
getDetailsQuery(transaction, nextTx, transactionPk, dataReduction, firstArrivingMeterValueIfMultiple)
147141
.fetch()
148142
.map(r -> TransactionDetails.MeterValues.builder()
@@ -159,29 +153,25 @@ public TransactionDetails getDetails(int transactionPk,
159153
return new TransactionDetails(transaction, values, nextTx);
160154
}
161155

162-
private SelectQuery<Record8<DateTime, String, String, String, String, String, String, String>>
163-
getDetailsQuery(Transaction transaction, TransactionStartRecord nextTx, int transactionPk,
156+
private SelectQuery<Record8<DateTime, String, String, String, String, String, String, String>>
157+
getDetailsQuery(Transaction transaction, TransactionStartRecord nextTx, int transactionPk,
164158
boolean dataReduction, boolean firstArrivingMeterValueIfMultiple) {
165-
166-
// // -------------------------------------------------------------------------
167-
// // Step 1a: Collect general data about transaction
168-
// // -------------------------------------------------------------------------
169-
//
159+
// -------------------------------------------------------------------------
160+
// Step 1a: Collect general data about transaction
161+
// -------------------------------------------------------------------------
162+
//
170163
DateTime startTimestamp = transaction.getStartTimestamp();
171164
DateTime stopTimestamp = transaction.getStopTimestamp();
172165
String stopValue = transaction.getStopValue();
173166
String chargeBoxId = transaction.getChargeBoxId();
174167
int connectorId = transaction.getConnectorId();
175-
176168
// -------------------------------------------------------------------------
177169
// Step 2: Collect intermediate meter values
178170
// -------------------------------------------------------------------------
179-
171+
//
180172
Condition timestampCondition;
181173
//TransactionStartRecord nextTx = null;
182-
183174
if (stopTimestamp == null && stopValue == null) {
184-
185175
// https://github.com/steve-community/steve/issues/97
186176
//
187177
// handle "zombie" transaction, for which we did not receive any StopTransaction. if we do not handle it,
@@ -235,19 +225,19 @@ public TransactionDetails getDetails(int transactionPk,
235225
// UNION removes all duplicate records
236226
//
237227
Table<ConnectorMeterValueRecord> t1 = transactionQuery.union(timestampQuery).asTable("t1");
238-
if (dataReduction == false) {
228+
if (!dataReduction) {
239229
return ctx.select(
240-
t1.field(2, DateTime.class),
241-
t1.field(3, String.class),
242-
t1.field(4, String.class),
243-
t1.field(5, String.class),
244-
t1.field(6, String.class),
245-
t1.field(7, String.class),
246-
t1.field(8, String.class),
247-
t1.field(9, String.class))
248-
.from(t1)
249-
//.orderBy(innerTable.field(2))
250-
.getQuery();
230+
t1.field(2, DateTime.class),
231+
t1.field(3, String.class),
232+
t1.field(4, String.class),
233+
t1.field(5, String.class),
234+
t1.field(6, String.class),
235+
t1.field(7, String.class),
236+
t1.field(8, String.class),
237+
t1.field(9, String.class))
238+
.from(t1)
239+
//.orderBy(innerTable.field(2))
240+
.getQuery();
251241
}
252242

253243
// -------------------------------------------------------------------------
@@ -259,7 +249,7 @@ public TransactionDetails getDetails(int transactionPk,
259249
// -------------------------------------------------------------------------
260250

261251
//Field<DateTime> dateTimeField;
262-
Table<Record11<Integer, Integer, DateTime, String, String, String,
252+
Table<Record11<Integer, Integer, DateTime, String, String, String,
263253
String, String, String, String, Double>> innerTable;
264254
if (firstArrivingMeterValueIfMultiple) {
265255
//dateTimeField = DSL.min(t1.field(2, DateTime.class)).as("min");
@@ -284,7 +274,6 @@ public TransactionDetails getDetails(int transactionPk,
284274
.where(t1.field("transaction_pk", Integer.class).eq(transactionPk))
285275
.and((t1.field("format", String.class).eq("raw")).or(t1.field("format", String.class).isNull()))
286276
.asTable();
287-
288277
} else {
289278
//dateTimeField = DSL.max(t1.field(2, DateTime.class)).as("max");
290279
innerTable =

‎src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ public class TransactionsReservationsController {
6565
private static final String TRANSACTIONS_PATH = "/transactions";
6666
private static final String TRANSACTION_STOP_PATH = "/transactions/stop/{transactionPk}";
6767
private static final String TRANSACTIONS_DETAILS_PATH = "/transactions/details/{transactionPk}";
68-
private static final String TRANSACTIONS_DETAILS_XLS_PATH = "/transactions/detailsxls";
69-
68+
private static final String TRANSACTIONS_DETAILS_XLS_PATH = "/transactions/detailsxls";
7069
private static final String TRANSACTIONS_QUERY_PATH = "/transactions/query";
7170
private static final String RESERVATIONS_PATH = "/reservations";
7271
private static final String RESERVATIONS_QUERY_PATH = "/reservations/query";
@@ -134,13 +133,11 @@ public String getTransactionsDetailXLS(@Valid @ModelAttribute(PARAMS) Transactio
134133
return null;
135134
}
136135
int transactionPk = params.getTransactionPk();
137-
138136
String fileName = "transaction" + transactionPk + "_MeterValues.csv";
139137
String headerKey = "Content-Disposition";
140138
String headerValue = String.format("attachment; filename=\"%s\"", fileName);
141139
response.setContentType("text/csv");
142140
response.setHeader(headerKey, headerValue);
143-
144141
transactionRepository.writeTransactionsDetailsCSV(transactionPk,
145142
response.getWriter(),
146143
params.isDataReduction(),
@@ -152,7 +149,6 @@ public String getTransactionsDetailXLS(@Valid @ModelAttribute(PARAMS) Transactio
152149
public String getReservations(Model model) {
153150
ReservationQueryForm params = new ReservationQueryForm();
154151
initResList(model);
155-
156152
model.addAttribute("reservList", reservationRepository.getReservations(params));
157153
model.addAttribute(PARAMS, params);
158154
return "data-man/reservations";
@@ -164,7 +160,6 @@ public String getReservationsQuery(@Valid @ModelAttribute(PARAMS) ReservationQue
164160
if (!result.hasErrors()) {
165161
model.addAttribute("reservList", reservationRepository.getReservations(params));
166162
}
167-
168163
initResList(model);
169164
model.addAttribute(PARAMS, params);
170165
return "data-man/reservations";

0 commit comments

Comments
 (0)