Skip to content

fixing-fetching #98

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
dpiyumal2319 merged 2 commits into from
May 10, 2025
Merged

fixing-fetching #98

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8666ae
Revert "refactor: replace fetch with Axios for stock data retrieval a…
dpiyumal2319 May 10, 2025
3afcb0c
fix: include credentials in fetch request for predicted prices
dpiyumal2319 May 10, 2025
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
60 changes: 32 additions & 28 deletions src/app/(dashboard)/dashboard/stockmarketprediction/_components/stock-dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import StockDataTable from "./stock-data-table"
import ModelMetadata from "./model-metadata"
//import {getStockData, getPredictionData, getModelMetadata} from "@/lib/data"
import {exportToCSV} from "@/lib/export"
import {BACKEND_BASE_URL} from "@/lib/const"
import {PredictionData, StockData, ModelMetadataType} from "@/lib/types/stock_prediction";
import AxiosInstance from "@/lib/client-fetcher";
import {AxiosError} from "axios";
// import { number } from "zod"

type companyType = {
Expand All @@ -34,6 +34,7 @@ const formatDate = (date: Date) => {
return date.toLocaleDateString("en-CA"); // "YYYY-MM-DD" format
};

const BASE_URL = BACKEND_BASE_URL

export default function StockDashboard() {
const [selectedCompany, setSelectedCompany] = useState<string>("")
Expand All @@ -58,7 +59,7 @@ export default function StockDashboard() {
const fetchCompanies = async () => {
try {
setIsLoading(true);
const response = await AxiosInstance.get(`/get-active-symbols`);
const response = await AxiosInstance.get(`${BASE_URL}/get-active-symbols`);
const data = response.data;
setCompanies(data.symbols);
setSelectedCompany(data.symbols[0].value);
Expand All @@ -79,35 +80,38 @@ export default function StockDashboard() {
const fetchStockData = async () => {
setPredicting(true); // Show loading popup
try {
const response = await AxiosInstance.post(`/V2/get-predicted-prices`, {
starting_date: formatDate(dateRange.from ?? new Date()),
ending_date: formatDate(dateRange.to ?? new Date()),
ticker_symbol: selectedCompany,
const response = await fetch(`${BASE_URL}/V2/get-predicted-prices`, {
method: "POST",
credentials: "include",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
starting_date: formatDate(dateRange.from ?? new Date()),
ending_date: formatDate(dateRange.to ?? new Date()),
ticker_symbol: selectedCompany,
}),
});
const data = response.data;
setStockData(data.stockData);
setModelMetadata(data.modelMetadata);
setPredictionData(data.predictionData);
if (
data.predictionData &&
data.stockData &&
data.stockData.history.length > 0 &&
data.predictionData.predictions.length > 0
) {
const lastPrediction = data.predictionData.predictions[data.predictionData.predictions.length - 1].predicted;
const lastPrice = data.stockData.history[data.stockData.history.length - 1].price;
const percentageChange = ((lastPrediction - lastPrice) / lastPrice) * 100;
setSevchange(percentageChange);
}
} catch (error) {
if (error instanceof AxiosError) {
if (error.response && error.response.data && error.response.data.detail) {
setDataerror(error.response.data.detail);
} else {
setDataerror("Resource not found");
if (response.ok) {
const data = await response.json();
setStockData(data.stockData);
setModelMetadata(data.modelMetadata);
setPredictionData(data.predictionData)
if (data.predictionData && data.stockData && data.stockData.history.length > 0 && data.predictionData.predictions.length > 0) {
const lastPrediction = data.predictionData.predictions[data.predictionData.predictions.length - 1].predicted;
const lastPrice = data.stockData.history[data.stockData.history.length - 1].price;
const percentageChange = ((lastPrediction - lastPrice) / lastPrice) * 100;
setSevchange(percentageChange);
}

} else {
const result = await response.json();
setDataerror(result.detail || "Resource not found");
return;
}
console.error("Error fetching stock data", error);

} catch {
console.error("Error fetching stock data");
} finally {
setPredicting(false); // Hide loading popup
}
Expand Down