Skip to content

Refactor WebPageController to use IPriceController and ComparisonResult #59

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

Merged
lukepring merged 4 commits into from
Mar 20, 2026
Merged

Refactor WebPageController to use IPriceController and ComparisonResult #59

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c66b3e
Initial plan
Copilot Mar 20, 2026
28fb4a5
Refactor WebPageController to use IPriceController and ComparisonResult
Copilot Mar 20, 2026
617a00a
Merge branch 'Sprint-2-Jack' into copilot/sub-pr-55-yet-again
lukepring Mar 20, 2026
38c290f
Fix WebPageController merge regression
Copilot Mar 20, 2026
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
110 changes: 9 additions & 101 deletions stockscope/src/main/java/com/sharecomparison/presentation/WebPageController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,22 @@
package com.sharecomparison.presentation;

import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;

import com.sharecomparison.application.MarketDataService;
import com.sharecomparison.domain.PriceData;
import com.sharecomparison.application.IPriceController;
import com.sharecomparison.domain.ComparisonResult;

@Controller
public class WebPageController {

private final MarketDataService marketDataService;
private final IPriceController priceController;

public WebPageController(MarketDataService marketDataService) {
this.marketDataService = marketDataService;
public WebPageController(IPriceController priceController) {
this.priceController = priceController;
}

@GetMapping("/")
Expand All @@ -37,7 +29,7 @@ public String showForm(Model model) {
return "index";
}

@GetMapping("/compare")
@GetMapping("/compare")
public String compare(
@RequestParam String symbol1,
@RequestParam String symbol2,
Expand All @@ -51,10 +43,9 @@ public String compare(
symbol1 = symbol1.trim().toUpperCase();
symbol2 = symbol2.trim().toUpperCase();

List<PriceData> data1 = marketDataService.fetchSharePrices(symbol1, start, end);
List<PriceData> data2 = marketDataService.fetchSharePrices(symbol2, start, end);
ComparisonResult result = priceController.comparePrices(symbol1, symbol2, start, end);

if (data1.isEmpty() || data2.isEmpty()) {
if (result.getSymbol1Data().isEmpty() || result.getSymbol2Data().isEmpty()) {
model.addAttribute("error", "No data available for one or both symbols in this range.");
model.addAttribute("symbol1", symbol1);
model.addAttribute("symbol2", symbol2);
Expand All @@ -63,89 +54,6 @@ public String compare(
return "index";
}

data1.sort(Comparator.comparing(PriceData::getDate));
data2.sort(Comparator.comparing(PriceData::getDate));

// Chart coords calculation
double chartWidth = 800, chartHeight = 300;
double left = 80, right = left + chartWidth;
double bottom = 320, top = bottom - chartHeight;
double midY = top + chartHeight / 2;

double minPrice = Double.MAX_VALUE, maxPrice = Double.MIN_VALUE;
for (PriceData p : data1) {
minPrice = Math.min(minPrice, p.getClosingPrice());
maxPrice = Math.max(maxPrice, p.getClosingPrice());
}
for (PriceData p : data2) {
minPrice = Math.min(minPrice, p.getClosingPrice());
maxPrice = Math.max(maxPrice, p.getClosingPrice());
}
if (maxPrice == minPrice) maxPrice += 1.0;
double priceRange = maxPrice - minPrice;

// Align series by date: only plot dates present in both data sets
Map<LocalDate, PriceData> map1 = data1.stream()
.collect(Collectors.toMap(PriceData::getDate, p -> p, (existing, replacement) -> existing));
Map<LocalDate, PriceData> map2 = data2.stream()
.collect(Collectors.toMap(PriceData::getDate, p -> p, (existing, replacement) -> existing));

Set<LocalDate> commonDates = new LinkedHashSet<>(map1.keySet());
commonDates.retainAll(map2.keySet());
List<LocalDate> sortedDates = new ArrayList<>(commonDates);
sortedDates.sort(Comparator.naturalOrder());

int n = sortedDates.size();
if (n == 0) {
model.addAttribute("error", "No overlapping trading dates found for the two symbols in this range.");
model.addAttribute("symbol1", symbol1);
model.addAttribute("symbol2", symbol2);
model.addAttribute("startDate", start.toString());
model.addAttribute("endDate", end.toString());
return "index";
}
double xStep = n > 1 ? chartWidth / (n - 1) : 0;

StringBuilder path1 = new StringBuilder();
StringBuilder path2 = new StringBuilder();
List<Map<String, Object>> points1 = new ArrayList<>();
List<Map<String, Object>> points2 = new ArrayList<>();

for (int i = 0; i < n; i++) {
double x = left + i * xStep;
LocalDate date = sortedDates.get(i);

PriceData p1 = map1.get(date);
double y1 = bottom - ((p1.getClosingPrice() - minPrice) / priceRange) * chartHeight;
path1.append(i == 0 ? "M" : "L").append(x).append(",").append(y1).append(" ");
points1.add(Map.of("x", x, "y", y1, "value", p1.getClosingPrice(), "date", date.toString()));

PriceData p2 = map2.get(date);
double y2 = bottom - ((p2.getClosingPrice() - minPrice) / priceRange) * chartHeight;
path2.append(i == 0 ? "M" : "L").append(x).append(",").append(y2).append(" ");
points2.add(Map.of("x", x, "y", y2, "value", p2.getClosingPrice(), "date", date.toString()));
}

Map<String, Object> chartData = new HashMap<>();
chartData.put("left", left);
chartData.put("right", right);
chartData.put("top", top);
chartData.put("bottom", bottom);
chartData.put("midY", midY);
chartData.put("symbol1Path", path1.toString());
chartData.put("symbol2Path", path2.toString());
chartData.put("symbol1Points", points1);
chartData.put("symbol2Points", points2);

Map<String, Object> result = new HashMap<>();
result.put("symbol1", symbol1);
result.put("symbol2", symbol2);
result.put("startDate", start);
result.put("endDate", end);
result.put("chartData", chartData);
result.put("symbol1Data", data1);
result.put("symbol2Data", data2);

model.addAttribute("result", result);
model.addAttribute("symbol1", symbol1);
model.addAttribute("symbol2", symbol2);
Expand All @@ -154,4 +62,4 @@ public String compare(

return "index";
}
}
}