Recreate station screen with ReactJS

.gitignore

@@ -46,5 +46,5 @@ venv/
 db.sqlite3
 db.sqlite3-journal
 
-# Don't git index
-whoosh_index/
+node_modules/
+

sncf-station/.gitignore

@@ -0,0 +1,23 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

sncf-station/README.md

@@ -0,0 +1,70 @@
+# Getting Started with Create React Station
+
+This project was bootstrapped with [Create React Station](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.\
+Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
+
+The page will reload when you make changes.\
+You may also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.\
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can't go back!**
+
+If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
+
+You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React Station documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).
+
+### Code Splitting
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
+
+### Analyzing the Bundle Size
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
+
+### Making a Progressive Web Station
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
+
+### Advanced Configuration
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
+
+### Deployment
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
+
+### `npm run build` fails to minify
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)

sncf-station/package.json

@@ -0,0 +1,41 @@
+{
+  "name": "sncf-station",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@testing-library/jest-dom": "^5.17.0",
+    "@testing-library/react": "^13.4.0",
+    "@testing-library/user-event": "^13.5.0",
+    "bootstrap": "^5.3.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-router-dom": "^6.21.3",
+    "react-scripts": "5.0.1",
+    "sass": "^1.70.0",
+    "web-vitals": "^2.1.4"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+  },
+  "eslintConfig": {
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  }
+}

sncf-station/public/index.html

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="fr" data-bs-theme="dark">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Web site created using create-react-app"
+    />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+
+    <title>Écrans en gare</title>
+  </head>
+  <body>
+    <noscript>Vous avez besoin de JavaScript pour utiliser cette application.</noscript>
+    <div id="root"></div>
+  </body>
+</html>

sncf-station/public/manifest.json

@@ -0,0 +1,25 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

sncf-station/public/robots.txt

@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:

sncf-station/src/Station.js

@@ -0,0 +1,32 @@
+import './sncf.scss'
+import {useParams} from "react-router-dom"
+import TrainsTable from "./TrainsTable"
+import {useEffect, useState} from "react";
+
+function Station() {
+  let {stopId} = useParams()
+  let [stop, setStop] = useState({'name': "Chargement…"})
+
+  useEffect(() => {
+    fetch(`http://localhost:8000/api/gtfs/stop/${stopId}/`)
+      .then(response => response.json())
+      .then(data => {
+        setStop(data)
+      })
+  }, [stopId])
+
+  return (
+    <div className="Station">
+      <header className="App-header">
+        <h1>Horaires en gare de {stop.name}</h1>
+      </header>
+
+      <main>
+        <TrainsTable stop={stop} tableType="departures" />
+        <TrainsTable stop={stop} tableType="arrivals" />
+      </main>
+    </div>
+  )
+}
+
+export default Station;

sncf-station/src/Station.test.js

@@ -0,0 +1,8 @@
+import { render, screen } from '@testing-library/react';
+import Station from './Station';
+
+test('renders learn react link', () => {
+  render(<Station />);
+  const linkElement = screen.getByText(/learn react/i);
+  expect(linkElement).toBeInTheDocument();
+});

sncf-station/src/TrainsTable.js

@@ -0,0 +1,185 @@
+import {useEffect, useState} from "react";
+
+function TrainsTable({stop, tableType}) {
+  let tableClass = tableType === "departures" ? "table-departures" : "table-arrivals"
+  tableClass = `table table-striped ${tableClass}`
+  return <>
+    <table className={tableClass}>
+      <TrainsTableHeader />
+      <TrainsTableBody stop={stop} tableType={tableType} />
+    </table>
+  </>
+}
+
+function TrainsTableHeader() {
+  return <thead>
+    <tr>
+      <th className="px-3 py-1" scope="col" colSpan="2">Train</th>
+      <th className="px-3 py-1" scope="col">Heure</th>
+      <th className="px-3 py-1" scope="col">Destination</th>
+    </tr>
+  </thead>
+}
+
+function TrainsTableBody({stop, tableType}) {
+  const [trains, setTrains] = useState([])
+
+  useEffect(() => {
+    if (stop.id !== undefined) {
+      fetch(`http://localhost:8000/api/station/next_${tableType}/?stop_id=${stop.id}&format=json`)
+        .then(response => response.json())
+        .then(data => data.results)
+        .then(data => {
+          setTrains(data)
+        })
+    }
+  }, [stop, tableType])
+
+  let table_rows = trains.map((train) => <TrainRow train={train} tableType={tableType} />)
+
+  return <tbody>
+    {table_rows}
+  </tbody>
+}
+
+function TrainRow({train, tableType}) {
+  const [trip, setTrip] = useState({})
+  const [route, setRoute] = useState({})
+  const [stopTimes, setStopTimes] = useState([])
+  const [trainType, setTrainType] = useState("")
+
+  useEffect(() => {
+    if (train.trip !== undefined) {
+      fetch(`http://localhost:8000/api/gtfs/trip/${train.trip}/`)
+        .then(response => response.json())
+        .then(t => {
+          t.stop_times = []
+          setTrip(t)
+        })
+    }
+  }, [train.trip])
+
+  useEffect(() => {
+    if (trip.route !== undefined) {
+      fetch(`http://localhost:8000/api/gtfs/route/${trip.route}/`)
+        .then(response => response.json())
+        .then(data => {
+          setRoute(data)
+        })
+    }
+  }, [trip.route])
+
+  useEffect(() => {
+    if (route !== undefined) {
+      setTrainType(getTrainType(train, route))
+    }
+  }, [train, route]);
+
+  useEffect(() => {
+    if (trip.route !== undefined) {
+      fetch(`http://localhost:8000/api/gtfs/stop_time/?trip=${trip.id}&order=stop_sequence&limit=1000`)
+        .then(response => response.json())
+        .then(data => data.results)
+        .then(stop_times => {
+          Promise.all(stop_times.map(stop_time =>
+            fetch(`http://localhost:8000/api/gtfs/stop/${stop_time.stop}/`).then(response => response.json())
+          )).then(stops => {
+            setStopTimes(stop_times.map((stop_time, index) => {
+              stop_time.stop = stops[index]
+              return stop_time
+            }))
+          })
+        })
+    }
+  }, [trip.route])
+
+  let headline = stopTimes[tableType === "departures" ? stopTimes.length - 1 : 0]?.stop ?? {name: "Chargement…"}
+  let stops_names = stopTimes.filter(stop_time => tableType === "departures" ? stop_time.stop_sequence > train.stop_sequence : stop_time.stop_sequence < train.stop_sequence)
+    .map(stop_time => stop_time?.stop.name ?? "").join(", ")
+
+  let style = {
+    width: "4em",
+    height: "4em",
+    borderRadius: "15%",
+    backgroundColor: `#${getBackgroundColor(train, route)}`,
+    color: `#${getTextColor(train, route)}`,
+    fontWeight: "bold",
+  }
+
+  return <>
+    <tr className="h-100">
+      <td className="h-100">
+        <div className="train-type d-flex h-100 align-items-center justify-content-center">
+          <div
+            className="transilien-route d-flex align-items-center justify-content-center font-weight-bold small p-1 m-2 text-center text-wrap"
+            style={style}>
+            {trainType}
+        </div>
+      </div>
+    </td>
+    <td className="h-100">
+      <div className="train-number d-flex align-items-center justify-content-center h-100">
+        <div>
+          <div>{trip.short_name}</div>
+          <div>{trip.headsign}</div>
+        </div>
+      </div>
+    </td>
+    <td>
+      <div className="table-hour d-flex align-items-center justify-content-center text-time fw-bold h-100">
+        {train.departure_time}
+      </div>
+    </td>
+    <td>
+      <h3 className="headline">{headline.name}</h3>
+      <span className="stops">{stops_names}</span>
+    </td>
+    </tr>
+  </>
+}
+
+function getTrainType(train, route) {
+  if (train.id.startsWith("IDFM"))
+    return route.short_name
+  else {
+    let trainType = train.stop.split("StopPoint:OCE")[1].split("-")[0]
+    if (trainType === "Train TER")
+      trainType = "TER"
+    else if (trainType === "INTERCITES")
+      trainType = "INTER-CITÉS"
+    else if (trainType === "INTERCITES de nuit")
+      trainType = "INTER-CITÉS de nuit"
+    return trainType
+  }
+}
+
+function getBackgroundColor(train, route) {
+  if (route.color)
+    return route.color
+  else if (getTrainType(train, route) === "OUIGO")
+    return "E60075"
+  return "FFFFFF"
+}
+
+function getTextColor(train, route) {
+  if (route.text_color)
+    return route.text_color
+  else {
+    let trainType = getTrainType(train, route)
+    switch (trainType) {
+      case "OUIGO":
+        return "FFFFFF"
+      case "TGV INOUI":
+        return "9B2743"
+      case "ICE":
+        return "B4B4B4"
+      case "INTER-CITÉS":
+      case "INTER-CITÉS de nuit":
+        return "404042"
+      default:
+        return "000000"
+    }
+  }
+}
+
+export default TrainsTable;

sncf-station/src/index.css

@@ -0,0 +1,13 @@
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+    sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+code {
+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+    monospace;
+}

sncf-station/src/index.js

@@ -0,0 +1,29 @@
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import './index.css';
+import Station from './Station';
+import reportWebVitals from './reportWebVitals';
+import {createBrowserRouter, RouterProvider} from "react-router-dom";
+
+const router = createBrowserRouter([
+  {
+    path: "/",
+    element: <div>Hello World!</div>
+  },
+  {
+    path: "/station/:stopId",
+    element: <Station />
+  }
+])
+
+const root = ReactDOM.createRoot(document.getElementById('root'));
+root.render(
+  <React.StrictMode>
+    <RouterProvider router={router} />
+  </React.StrictMode>
+);
+
+// If you want to start measuring performance in your app, pass a function
+// to log results (for example: reportWebVitals(console.log))
+// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
+reportWebVitals();

sncf-station/src/logo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

sncf-station/src/reportWebVitals.js

@@ -0,0 +1,13 @@
+const reportWebVitals = onPerfEntry => {
+  if (onPerfEntry && onPerfEntry instanceof Function) {
+    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
+      getCLS(onPerfEntry);
+      getFID(onPerfEntry);
+      getFCP(onPerfEntry);
+      getLCP(onPerfEntry);
+      getTTFB(onPerfEntry);
+    });
+  }
+};
+
+export default reportWebVitals;

sncf-station/src/setupTests.js

@@ -0,0 +1,5 @@
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom';

sncf-station/src/sncf.scss

@@ -0,0 +1,31 @@
+@import "~bootstrap/scss/_functions.scss";
+@import "~bootstrap/scss/_variables.scss";
+
+$departures: #003A79;
+$arrivals: #1F5628;
+$time: #FF9500;
+
+$custom-colors: (
+  "departures": $departures,
+    "arrivals": $arrivals,
+    "time": $time,
+);
+
+// Merge the maps
+$theme-colors: map-merge($theme-colors, $custom-colors);
+
+$sncf-table-variants: (
+  "departures": $departures,
+  "arrivals": $arrivals,
+);
+$sncf-table-variants-stripped: (
+  "departures": $departures,
+  "arrivals": $arrivals,
+);
+
+$table-variants: map-merge($table-variants, $sncf-table-variants);
+$table-striped-bg-factor: 0.25;
+
+
+
+@import "~bootstrap/scss/bootstrap.scss";

sncf/api/views.py

@@ -1,8 +1,9 @@
 from datetime import datetime, timedelta, date
 
-from django.db.models import F, Q, OuterRef, Subquery
+from django.db.models import F, Q
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import viewsets
+from rest_framework.filters import OrderingFilter
 
 from sncf.api.serializers import AgencySerializer, StopSerializer, RouteSerializer, TripSerializer, \
     StopTimeSerializer, CalendarSerializer, CalendarDateSerializer, TransferSerializer, \
@@ -42,8 +43,10 @@ class TripViewSet(viewsets.ReadOnlyModelViewSet):
 class StopTimeViewSet(viewsets.ReadOnlyModelViewSet):
     queryset = StopTime.objects.order_by('id').all()
     serializer_class = StopTimeSerializer
-    filter_backends = [DjangoFilterBackend]
+    filter_backends = [DjangoFilterBackend, OrderingFilter]
     filterset_fields = '__all__'
+    ordering_fields = ['arrival_time', 'departure_time', 'stop_sequence',]
+    ordering = ['stop_sequence',]
 
 
 class CalendarViewSet(viewsets.ReadOnlyModelViewSet):
@@ -95,9 +98,10 @@ class NextDeparturesViewSet(viewsets.ReadOnlyModelViewSet):
         if stop_id:
             stop = Stop.objects.get(id=stop_id)
             stops = Stop.objects.filter(Q(id=stop_id)
-                                        | Q(parent_station=stop_id)
-                                        | Q(parent_station=stop.parent_station_id)).values_list('id', flat=True)
-            stop_filter = Q(stop__in=stops)
+                                        | Q(parent_station=stop_id))
+            if stop.location_type == 0:
+                stops |= Stop.objects.filter(parent_station=stop.parent_station_id)
+            stop_filter = Q(stop__in=stops.values_list('id', flat=True))
         elif stop_name:
             stops = Stop.objects.filter(name__iexact=stop_name).values_list('id', flat=True)
             stop_filter = Q(stop__in=stops)
@@ -150,9 +154,10 @@ class NextArrivalsViewSet(viewsets.ReadOnlyModelViewSet):
         if stop_id:
             stop = Stop.objects.get(id=stop_id)
             stops = Stop.objects.filter(Q(id=stop_id)
-                                        | Q(parent_station=stop_id)
-                                        | Q(parent_station=stop.parent_station_id)).values_list('id', flat=True)
-            stop_filter = Q(stop__in=stops)
+                                        | Q(parent_station=stop_id))
+            if stop.location_type == 0:
+                stops |= Stop.objects.filter(parent_station=stop.parent_station_id)
+            stop_filter = Q(stop__in=stops.values_list('id', flat=True))
         elif stop_name:
             stops = Stop.objects.filter(name__iexact=stop_name).values_list('id', flat=True)
             stop_filter = Q(stop__in=stops)

sncf/settings.py

@@ -38,6 +38,7 @@ INSTALLED_APPS = [
     "django.contrib.messages",
     "django.contrib.staticfiles",
 
+    "corsheaders",
     "django_filters",
     "rest_framework",
 
@@ -48,6 +49,7 @@ INSTALLED_APPS = [
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
+    "corsheaders.middleware.CorsMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
@@ -55,6 +57,10 @@ MIDDLEWARE = [
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
+CORS_ALLOWED_ORIGINS = [
+    "http://localhost:3000",
+]
+
 ROOT_URLCONF = "sncf.urls"
 
 TEMPLATES = [

sncfgtfs/admin.py

@@ -69,7 +69,7 @@ class CalendarDateAdmin(admin.ModelAdmin):
 class TransferAdmin(admin.ModelAdmin):
     list_display = ('from_stop', 'to_stop', 'transfer_type', 'min_transfer_time',)
     list_filter = ('transfer_type',)
-    search_fields = ('from_stop__stop_name', 'to_stop__stop_name',)
+    search_fields = ('from_stop__name', 'to_stop__name',)
     autocomplete_fields = ('from_stop', 'to_stop',)
 
 

sncfgtfs/management/commands/update_sncf_gtfs.py

@@ -28,7 +28,7 @@ class Command(BaseCommand):
         if not FeedInfo.objects.exists():
             last_update_date = "1970-01-01"
         else:
-            last_update_date = FeedInfo.objects.get().feed_version
+            last_update_date = FeedInfo.objects.get().version
 
         for url in self.GTFS_FEEDS.values():
             last_modified = requests.head(url).headers["Last-Modified"]