Skip to content

Commit

Permalink
remove SiTiming results view
Browse files Browse the repository at this point in the history 
- due to low use
- duplicated results view creating more work
- results can still be uploaded properly to be viewed
  • Loading branch information
@brownben
brownben committed Jan 28, 2024
1 parent 4305a16 commit d97f0fe
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 401 deletions.
49 changes: 1 addition & 48 deletions backend/src/routes/misc.py
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,14 @@
import re

from fastapi.routing import APIRouter

from src.utils.assign_positions import assign_position_based_on_time

from ..database import Events, Leagues, Results
from ..exceptions import HTTP_500
from ..schemas import EventResult, EventWithResults, HomeDetails
from ..utils.get_results import get_document_from_url
from ..utils.import_file import ImportException, import_results_from_file
from ..schemas import HomeDetails

router = APIRouter(
prefix="/misc",
tags=["Miscellaneous"],
)


def get_event_name_from_sitiming_html(html: str) -> str:
heading = re.search("<h2>(.*?)</h2>", html)

if not heading:
raise HTTP_500("Expected results to have a heading")

return heading.group(1).replace("Results for ", "").strip().split(" -")[0]


@router.get("/sitiming", response_model=EventWithResults)
async def get_results_from_sitiming(url: str) -> EventWithResults:
html = await get_document_from_url(url)
event_name = get_event_name_from_sitiming_html(html)

try:
imported_results = import_results_from_file(html)
except ImportException as exception:
raise HTTP_500(exception.message)

return EventWithResults(
id=event_name,
league="",
website="",
name=event_name,
results_links={"Standard Results": url},
results=assign_position_based_on_time(
(
EventResult(
competitor=0,
event=event_name,
type="sitiming",
id=index,
**dict(result),
)
for index, result in enumerate(imported_results)
)
),
)


@router.get("/home", response_model=HomeDetails)
async def get_home_details() -> HomeDetails:
return HomeDetails(
Expand Down
1 change: 0 additions & 1 deletion backend/src/routes/sitemap.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def add_url(self, route: str) -> None:
"/upload/instructions",
"/upload/file",
"/upload/result",
"/sitiming",
"/search",
]

Expand Down
167 changes: 0 additions & 167 deletions backend/src/routes/tests/test_misc.py
View file
Original file line number Diff line number Diff line change
@@ -1,175 +1,8 @@
import unittest

import httpx
import respx

from .helpers import TestCaseWithDatabase, get_client

client = get_client()


sample_sitiming_html_file = """
<html lang="en"><head><meta charset="utf-8"><meta http-equiv="Content-Type" content="text/html"><meta http-equiv="CACHE-CONTROL" content="NO-CACHE"><meta http-equiv="Expires" content="-1"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>Results for Test Event - 11 September 2021 - Provisional</title><link href="https://www.sportident.co.uk/sitiming/skins/v2/jquery/datatables.css" rel="stylesheet" type="text/css"><link href="https://www.sportident.co.uk/sitiming/skins/v2/standard.css" rel="stylesheet" type="text/css"><link href="https://www.sportident.co.uk/sitiming/skins/v2/flags.css" rel="stylesheet" type="text/css"><script src="https://www.sportident.co.uk/sitiming/skins/v2/jquery/jquery.js" type="text/javascript"></script><script src="https://www.sportident.co.uk/sitiming/skins/v2/jquery/datatables.js" type="text/javascript"></script><script src="https://www.sportident.co.uk/sitiming/skins/v2/jquery/jquery-ui.js" type="text/javascript"></script><script src="https://www.sportident.co.uk/sitiming/skins/v2/results.js" type="text/javascript"></script><script type="text/javascript">var ajaxRefreshInterval = undefined;function getData(tableNumber) {if (tableNumber == 0) return [["1st","1","James Gold","HAT","M21","27:00","\\u0026nbsp;"],["2nd","2","Philip Windsor","BAT","M21","27:11","+0:11"],["3rd","3","Helen Flight","DOG","W40","30:37","+3:37"],["4th","4","Simon Evans","JOB","M21","31:57","+4:57"]];if (tableNumber == 1) return [["1st","1","Ben Nevis","FISH","M20","23:34","\\u0026nbsp;"],["2nd","2","Fred Rick","HAD","W21","25:39","+2:05"],["3rd","3","Ellie Smith","\\u0026nbsp;","\\u0026nbsp;","26:52","+3:18"]];}</script></head><body><div id="container" class="full"><div id="header"><div id="header_left"></div><div id="header_right"><div><a href="https://www.sportident.co.uk" title="SiTiming from SPORTident" id="logo_header"><span>SiTiming from SPORTident</span></a></div></div><div class="clear"></div></div><div id="container_b"><div id="container_bp"><a href="https://www.sportident.co.uk" title="SiTiming from SPORTident" id="logo"><span>SiTiming from SPORTident</span></a><h2>Results for Sample Event - 11 September 2021 - Provisional</h2><div id="table-filter"><div class="ff-table"><div class="ff-row"><div class="ff-label"><label for="table-menu">Results</label></div><div class="ff-input"><div class="sf-field"><select id="table-menu" class="form-field" onchange="changeTable(this.value);" class="form-field-noresize"><option><option value="0">Long</option><option value="1">Short</option></select></div></div><div id="loader-table" class="loader"></div></div></div><div class="ff-row"><div class="ff-label"><label for="showdetail0">Display Details</label></div><div class="ff-field"><div class="ff-input"><input type="checkbox" class="form-checkbox detail-selector" id="showdetail0" onclick="showHideDetail()"></div></div></div></div><div id="search-box"><div class="ff-table"><div class="ff-row"><div class="ff-button"><button onclick="addSearch()" id="search_add" class="button-long button-search">Add Search</button></div></div><div class="ff-row search_row"><div class="ff-label"><label for="search_in0">Search</label></div><div class="ff-input"><div class="sf-field"><select name="search_in0" id="search_in0" title="Please choose the field you would like to search on." class="form-field-noresize"><option label="Name" value="0">Name</option><option label="Club" value="1">Club</option></select></div><div class="sf-field"><select name="search_equality0" id="search_equality0" title="Please choose the type of search to perform." class="form-field-noresize"><option label="Equals">equals</option><option label="Contains">contains</option></select></div><div class="sf-field"><input type="text" name="search_value0" id="search_value0" value="" size="15" maxlength="50" class="form-field-noresize" title="Please enter what you would like to search for."></div></div></div><div class="ff-row"><div class="ff-button"><button onclick="search()" id="search_find" class="button-long button-search">Find</button></div><div id="loader-search" class="loader"></div></div><div id="no-search-results" class="information-message"><p>Search returned no matches!</p></div></div></div><div id="nothing-selected" class="select-message"><p>Please select which "Results" you wish to see, or perform a search...</p></div><div id="results-block0" class="results-block"><div class="results-block-header"><div class="results-block-title"><h3>Long</h3></div></div><div class="clear"></div><div id="not-started0" class="information-message not-started"><p>Results will be added here soon after the event has taken place.</p></div><p class="results-block-info">5.0km</p><table id="results-table0" class="data" data-paging='false' data-order-multi='false' data-info='false'><thead><tr><th class="left nowrap" colspan="2">Pos<button class="sort results-sort0" title="Sort by Position" onclick='sortTable(0, 0)'></button></th><th class="left">Name</th><th class="left">Club</th><th class="centre">Age Class</th><th class="right">Time</th><th class="right">Behind</th></tr><tr class="last-header-row"><th class="detail-set" data-orderable='false' data-column-classes="left">&nbsp;</th><th class="results-sort0" data-type='position'>&nbsp;</th><th class="detail-set search-column0" data-orderable='false' data-column-classes="left">&nbsp;</th><th class="detail-set0 search-column1" data-orderable='false' data-column-classes="left">&nbsp;</th><th class="detail-set0" data-orderable='false' data-column-classes="centre">&nbsp;</th><th class="detail-set" data-orderable='false' data-column-classes="right">&nbsp;</th><th class="detail-set0" data-orderable='false' data-column-classes="right">&nbsp;</th></tr></thead></table></div><div id="results-block1" class="results-block"><div class="results-block-header"><div class="results-block-title"><h3>Short</h3></div></div><div class="clear"></div><div id="not-started1" class="information-message not-started"><p>Results will be added here soon after the event has taken place.</p></div><p class="results-block-info">1.8km</p><table id="results-table1" class="data" data-paging='false' data-order-multi='false' data-info='false'><thead><tr><th class="left nowrap" colspan="2">Pos<button class="sort results-sort0" title="Sort by Position" onclick='sortTable(1, 0)'></button></th><th class="left">Name</th><th class="left">Club</th><th class="centre">Age Class</th><th class="right">Time</th><th class="right">Behind</th></tr><tr class="last-header-row"><th class="detail-set" data-orderable='false' data-column-classes="left">&nbsp;</th><th class="results-sort0" data-type='position'>&nbsp;</th><th class="detail-set search-column0" data-orderable='false' data-column-classes="left">&nbsp;</th><th class="detail-set0 search-column1" data-orderable='false' data-column-classes="left">&nbsp;</th><th class="detail-set0" data-orderable='false' data-column-classes="centre">&nbsp;</th><th class="detail-set" data-orderable='false' data-column-classes="right">&nbsp;</th><th class="detail-set0" data-orderable='false' data-column-classes="right">&nbsp;</th></tr></thead></table></div></div><div class="copyright right"><p><a href="#top">Back to Top</a></p></div></div><div class="clear"></div><div id="footer"><div id="footer_a"><div class="padding"><div id="footer_a_left"></div><div id="footer_a_right"></div><div class="clear"></div></div></div></div><div id="footer_b"><div class="padding"><div id="footer_b_left"><p>SiTiming from <a href="https://www.sportident.co.uk">SPORTident</a></p><p class="copyright">v4.212.1942.4062 © SPORTident UK Ltd 2021</p><p class="copyright update_time">Updated 11-Aug-2021 22:19:26</p></div><div id="footer_b_right"><p>Updated 11-Aug-2021 22:19:26</p></div><div class="clear"></div></div></div></div></body></html>
"""


class MockRequestsResponse:
text: str

def __init__(self, text: str):
self.text = text


class TestSITimingRoutes(unittest.TestCase):
def test_no_url_provided(self) -> None:
response = client.get("/misc/sitiming")

self.assertEqual(response.status_code, 422)

@respx.mock
def test_file_success(self) -> None:
mock_requests_get = respx.get("https://example.com/results").mock(
return_value=httpx.Response(200, text=sample_sitiming_html_file)
)
response = client.get("/misc/sitiming?url=https%3A%2F%2Fexample.com%2Fresults")

self.assertTrue(mock_requests_get.called)
self.assertEqual(response.status_code, 200)

self.assertEqual(
response.json(),
{
"id": "Sample Event",
"name": "Sample Event",
"league": "",
"date": None,
"organiser": None,
"website": "",
"results_links": {"Standard Results": "https://example.com/results"},
"results": [
{
"id": 0,
"name": "James Gold",
"club": "HAT",
"age_class": "M21",
"time": 1620,
"course": "Long",
"incomplete": False,
"type": "sitiming",
"competitor": 0,
"position": 1,
},
{
"id": 1,
"name": "Philip Windsor",
"club": "BAT",
"age_class": "M21",
"time": 1631,
"course": "Long",
"incomplete": False,
"type": "sitiming",
"competitor": 0,
"position": 2,
},
{
"id": 2,
"name": "Helen Flight",
"club": "DOG",
"age_class": "W40",
"time": 1837,
"course": "Long",
"incomplete": False,
"type": "sitiming",
"competitor": 0,
"position": 3,
},
{
"id": 3,
"name": "Simon Evans",
"club": "JOB",
"age_class": "M21",
"time": 1917,
"course": "Long",
"incomplete": False,
"type": "sitiming",
"competitor": 0,
"position": 4,
},
{
"id": 4,
"name": "Ben Nevis",
"club": "FISH",
"age_class": "M20",
"time": 1414,
"course": "Short",
"incomplete": False,
"type": "sitiming",
"competitor": 0,
"position": 1,
},
{
"id": 5,
"name": "Fred Rick",
"club": "HAD",
"age_class": "W21",
"time": 1539,
"course": "Short",
"incomplete": False,
"type": "sitiming",
"competitor": 0,
"position": 2,
},
{
"id": 6,
"name": "Ellie Smith",
"club": "",
"age_class": "",
"time": 1612,
"course": "Short",
"incomplete": False,
"type": "sitiming",
"competitor": 0,
"position": 3,
},
],
},
)

@respx.mock
def test_no_heading(self) -> None:
mock_requests_get = respx.get("https://example.com/results").mock(
return_value=httpx.Response(200, text="")
)

response = client.get("/misc/sitiming?url=https%3A%2F%2Fexample.com%2Fresults")

self.assertTrue(mock_requests_get.called)
self.assertEqual(response.status_code, 500)

@respx.mock
def test_problem_fetching_result(self) -> None:
mock_requests_get = respx.get("https://example.com/results").mock(
return_value=httpx.Response(404)
)

response = client.get("/misc/sitiming?url=https%3A%2F%2Fexample.com%2Fresults")

self.assertTrue(mock_requests_get.called)
self.assertEqual(response.json(), {"detail": "Couldn't find results at URL"})
self.assertEqual(response.status_code, 404)

@respx.mock
def test_problem_processing_file(self) -> None:
mock_requests_get = respx.get("https://example.com/results").mock(
return_value=httpx.Response(200, text="<h2>Heading</h2>")
)

response = client.get("/misc/sitiming?url=https%3A%2F%2Fexample.com%2Fresults")

self.assertTrue(mock_requests_get.called)
self.assertEqual(response.status_code, 500)


class TestStats(TestCaseWithDatabase):
def test_home_route(self) -> None:
response = self.client.get(
Expand Down
16 changes: 0 additions & 16 deletions frontend/components/Home/SITiming.vue
View file

This file was deleted.

1 change: 0 additions & 1 deletion frontend/pages/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ const { data } = await useData<Home>(`misc/home`)

<HomeSearch />
<HomeUpload />
<HomeSITiming />
<HomeAbout />
</main>
</template>
Loading

1 comment on commit d97f0fe

@vercel
Copy link

@vercel vercel bot commented on d97f0fe Jan 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

munro – ./

munro-git-main-brownben.vercel.app
munro.vercel.app
munroleagues.com
munro-brownben.vercel.app

Please sign in to comment.