localhorst/e-commerce
Archived
4
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

feature/customers #58

Merged
Seil0 merged 8 commits from feature/customers into master 2020-06-12 00:52:54 +02:00
Conversation 3 Commits 8 Files Changed 3 +243 -81
3 changed files with 243 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 28834431ce - Show all commits

229
prototype/src/main/java/org/hso/ecommerce/controller/intern/AccountingController.java Normal file
View File

@ -0,0 +1,229 @@
package org.hso.ecommerce.controller.intern;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.hso.ecommerce.entities.booking.Booking;
import org.hso.ecommerce.entities.booking.BookingAccountEntry;
import org.hso.ecommerce.entities.booking.BookingReason;
import org.hso.ecommerce.repos.booking.BookingRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@Controller
public class AccountingController {
@Autowired
private BookingRepository bookingRepository = null;
/**
* A description used to render the html template for the overview of all bookings
*/
static class TemplateBooking {
public String datetime;
public String amount;
public String source;
public String sourceAddr;
public String sourceBalance;
public String destination;
public String destinationAddr;
public String destinationBalance;
public String reason;
public String reference;
public String referenceAddr;
}
/**
* A description used to render the html template for bookings on a specific account
*/
static class ShortTemplateBooking {
public String datetime;
public String amount;
public String source;
public String sourceAddr;
public String balance;
public String reason;
public String reference;
public String referenceAddr;
}
public static class ShortTemplateBookingResult {
public final String balance;
public final List<ShortTemplateBooking> bookings;
public ShortTemplateBookingResult(String balance, List<ShortTemplateBooking> bookings) {
this.balance = balance;
this.bookings = bookings;
}
}
/**
* Used to check which side of the booking (source or destination) is the account we are currently looking at.
*/
public interface AccountFilter {
boolean matches(BookingAccountEntry account);
}
/**
* Renders template information for the bookings of one specific account.
*
* @param bookings The (already fetched) booking entities to display
* @param currentAccount A filter matching the account that is to be displayed
* @return A collection result containing the final balance and all booking entries.
*/
public ShortTemplateBookingResult buildShortTemplate(List<Booking> bookings, AccountFilter currentAccount) {
List<ShortTemplateBooking> templateBookings = new ArrayList<>();
for (Booking booking : bookings) {
ShortTemplateBooking tb = new ShortTemplateBooking();
tb.datetime = new SimpleDateFormat("dd.MM.yyyy HH:mm").format(booking.created);
tb.reason = booking.reason.comment;
tb.reference = describeReference(booking.reason);
tb.referenceAddr = linkToReference(booking.reason);
if (booking.destination != null && currentAccount.matches(booking.destination)) {
// Money was transferred onto the account we are looking at.
tb.amount = fmtEuro(booking.amountCent);
if (booking.source != null) {
tb.source = describeAccount(booking.source);
tb.sourceAddr = linkAddrOfAccount(booking.source);
} else {
tb.source = "-";
tb.sourceAddr = null;
}
tb.balance = fmtEuro(booking.destination.newSumCent);
} else if (booking.source != null && currentAccount.matches(booking.source)) {
// Money was transferred away from the account we are looking at.
tb.amount = fmtEuro(-booking.amountCent); // Negative because of the transfer away
if (booking.destination != null) {
tb.source = describeAccount(booking.destination); // 'source' means 'the other account' in this case
tb.sourceAddr = linkAddrOfAccount(booking.destination);
} else {
tb.source = "-";
tb.sourceAddr = null;
}
tb.balance = fmtEuro(booking.source.newSumCent);
} else {
throw new RuntimeException(
"This booking should not appear in this list, because neither source nor destination is the account we are looking at.");
}
templateBookings.add(tb);
}
String balance = templateBookings.isEmpty() ? fmtEuro(0) : templateBookings.get(0).balance;
return new ShortTemplateBookingResult(balance, templateBookings);
}
private String fmtEuro(long amountCent) {
return String.format("%.2f EUR", amountCent / 100.0);
}
private String describeAccount(BookingAccountEntry account) {
if (account.isMainAccount) {
return "Hauptkonto";
} else if (account.isVATAccount) {
return "Mehrwertsteuer";
} else if (account.supplierAccount != null) {
return "Lieferant " + account.supplierAccount.id;
} else if (account.userAccount != null) {
return "Kunde " + account.userAccount.id;
} else {
return "- unbekannt -";
}
}
private String linkAddrOfAccount(BookingAccountEntry account) {
if (account.isMainAccount) {
return "/intern/accounting/main";
} else if (account.isVATAccount) {
return "/intern/accounting/vat";
} else if (account.supplierAccount != null) {
return "/intern/suppliers/" + account.supplierAccount.id;
} else if (account.userAccount != null) {
return "/intern/customers/" + account.userAccount.id;
} else {
return null;
}
}
private String describeReference(BookingReason reason) {
if (reason.customerOrder != null) {
return reason.customerOrder.id + "";
} else if (reason.customerPayment != null) {
return "Bezahlung mit Kreditkarte " + reason.customerPayment.payment.creditCardNumber;
} else if (reason.supplierOrder != null) {
return "Lieferanten-Bestellung " + reason.supplierOrder.id;
} else {
return "-";
}
}
private String linkToReference(BookingReason reason) {
if (reason.customerOrder != null) {
return "/intern/customerOrders/" + reason.customerOrder.id;
} else {
return null;
}
}
@GetMapping("/intern/accounting/")
public String accounting(HttpServletRequest request) {
List<Booking> bookings = bookingRepository.allBookingsReverseChronologically();
List<TemplateBooking> templateBookings = new ArrayList<>();
for (Booking booking : bookings) {
TemplateBooking tb = new TemplateBooking();
tb.datetime = new SimpleDateFormat("dd.MM.yyyy HH:mm").format(booking.created);
tb.amount = fmtEuro(booking.amountCent);
if (booking.source != null) {
tb.source = describeAccount(booking.source);
tb.sourceAddr = linkAddrOfAccount(booking.source);
tb.sourceBalance = fmtEuro(booking.source.newSumCent);
} else {
tb.source = "-";
tb.sourceAddr = null;
tb.sourceBalance = "-";
}
if (booking.destination != null) {
tb.destination = describeAccount(booking.destination);
tb.destinationAddr = linkAddrOfAccount(booking.destination);
tb.destinationBalance = fmtEuro(booking.destination.newSumCent);
} else {
tb.destination = "-";
tb.destinationAddr = null;
tb.destinationBalance = "-";
}
tb.reason = booking.reason.comment;
tb.reference = describeReference(booking.reason);
tb.referenceAddr = linkToReference(booking.reason);
templateBookings.add(tb);
}
request.setAttribute("bookings", templateBookings);
return "intern/accounting/index";
}
@GetMapping("/intern/accounting/vat")
public String accountingVat(HttpServletRequest request) {
List<Booking> bookings = bookingRepository.vatBookingsReverseChronologically();
ShortTemplateBookingResult result = buildShortTemplate(bookings, account -> account.isVATAccount);
request.setAttribute("balance", result.balance);
request.setAttribute("bookings", result.bookings);
return "intern/accounting/vat";
}
@GetMapping("/intern/accounting/main")
public String accountingIntern(HttpServletRequest request) {
List<Booking> bookings = bookingRepository.mainBookingsReverseChronologically();
ShortTemplateBookingResult result = buildShortTemplate(bookings, account -> account.isMainAccount);
request.setAttribute("balance", result.balance);
request.setAttribute("bookings", result.bookings);
return "intern/accounting/main";
}
@GetMapping("/intern/accounting/addManual")
public String accountingAddManual() {
return "intern/accounting/addManual";
}
}

38
prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/CustomersIndexController.java
View File

@ -1,11 +1,17 @@
package org.hso.ecommerce.controller.intern.customers;
import org.hso.ecommerce.entities.user.User;
import org.hso.ecommerce.repos.user.UserRepository;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.hso.ecommerce.controller.intern.AccountingController;
import org.hso.ecommerce.controller.intern.AccountingController.ShortTemplateBookingResult;
import org.hso.ecommerce.entities.booking.Booking;
import org.hso.ecommerce.repos.booking.BookingRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import java.util.List;
@ -15,20 +21,28 @@ import java.util.List;
public class CustomersIndexController {
@Autowired
private final UserRepository userRepository = null;
private BookingRepository bookingRepository = null;
@GetMapping("")
public String internCustomers(Model model) {
List<User> users = userRepository.findAll();
model.addAttribute("users", users);
@Autowired
private AccountingController accountingController = null;
@GetMapping("/")
public String internCustomers() {
return "intern/customers/index";
}
@GetMapping("/{id}")
public String internCustomersId() {
@GetMapping("/{customerId}")
public String internCustomersId(HttpServletRequest request, @PathVariable(required = true) long customerId) {
// Table of bookings
List<Booking> bookings = bookingRepository.customerBookingsReverseChronologically(customerId);
ShortTemplateBookingResult result = accountingController.buildShortTemplate(
bookings,
account -> account.userAccount != null && account.userAccount.id == customerId);
Seil0 commented 2020-06-11 14:41:43 +02:00
Outdated
Review
Copy Link

Kommt Doppelt vor.

Kommt Doppelt vor.
hhuber commented 2020-06-11 15:33:18 +02:00
Review
Copy Link

siehe 938d16301d

siehe 938d16301d
request.setAttribute("balance", result.balance);
request.setAttribute("bookings", result.bookings);
return "intern/customers/id";
}
}