diff --git a/app.js b/app.js index 5d545e8..89f8fba 100644 --- a/app.js +++ b/app.js @@ -40,6 +40,7 @@ async function updateDrivers() { "permanentNumber": driver.Driver.permanentNumber, "firstName": driver.Driver.givenName, "lastName": driver.Driver.familyName, + "age": getAge(driver.Driver.dateOfBirth), "firstYear": i, "nationality": driver.Driver.nationality, "constructor": driver.Constructors[0].name, @@ -68,12 +69,24 @@ function getRandomProperty(obj) { return keys[Math.floor(Math.random() * keys.length)] } +function getAge(dateString) { + var today = new Date(); + var birthDate = new Date(dateString); + var age = today.getFullYear() - birthDate.getFullYear(); + var m = today.getMonth() - birthDate.getMonth(); + if (m < 0 || (m === 0 && today.getDate() < birthDate.getDate())) { + age--; + } + return age; +} + function server() { var app = express() app.use(express.urlencoded({ extended: true })) app.get("/driver", (req, res) => { + if (!req.query.driver) return res.statusSend(400) let search = false let response = [] for (let query in drivers) { @@ -87,6 +100,11 @@ function server() { else if (parseInt(guess.permanentNumber) == parseInt(actual.permanentNumber)) response.push(1) // stay the same else if (parseInt(guess.permanentNumber) < parseInt(actual.permanentNumber)) response.push(2) // go up + // age + if (parseInt(guess.age) > parseInt(actual.age)) response.push(0) // go down + else if (parseInt(guess.age) == parseInt(actual.age)) response.push(1) // stay the same + else if (parseInt(guess.age) < parseInt(actual.age)) response.push(2) // go up + // first year if (parseInt(guess.firstYear) > parseInt(actual.firstYear)) response.push(0) // go down else if (parseInt(guess.firstYear) == parseInt(actual.firstYear)) response.push(1) // stay the same @@ -109,10 +127,11 @@ function server() { if (!search) return res.sendStatus(400) res.json({ "permanentNumber": response[0], - "firstYear": response[1], - "nationality": response[2], - "constructor": response[3], - "wins": response[4] + "age": response[1], + "firstYear": response[2], + "nationality": response[3], + "constructor": response[4], + "wins": response[5] }) }) diff --git a/drivers.json b/drivers.json index 21326fb..eccbd9d 100644 --- a/drivers.json +++ b/drivers.json @@ -1 +1 @@ -{"button":{"permanentNumber":"22","firstName":"Jenson","lastName":"Button","firstYear":2000,"nationality":"British","constructor":"McLaren","wins":15},"raikkonen":{"permanentNumber":"7","firstName":"Kimi","lastName":"Räikkönen","firstYear":2001,"nationality":"Finnish","constructor":"Alfa Romeo","wins":21},"alonso":{"permanentNumber":"14","firstName":"Fernando","lastName":"Alonso","firstYear":2001,"nationality":"Spanish","constructor":"Alpine F1 Team","wins":32},"massa":{"permanentNumber":"19","firstName":"Felipe","lastName":"Massa","firstYear":2002,"nationality":"Brazilian","constructor":"Williams","wins":11},"kubica":{"permanentNumber":"88","firstName":"Robert","lastName":"Kubica","firstYear":2006,"nationality":"Polish","constructor":"Alfa Romeo","wins":1},"rosberg":{"permanentNumber":"6","firstName":"Nico","lastName":"Rosberg","firstYear":2006,"nationality":"German","constructor":"Mercedes","wins":23},"hamilton":{"permanentNumber":"44","firstName":"Lewis","lastName":"Hamilton","firstYear":2007,"nationality":"British","constructor":"Mercedes","wins":103},"vettel":{"permanentNumber":"5","firstName":"Sebastian","lastName":"Vettel","firstYear":2007,"nationality":"German","constructor":"Aston Martin","wins":53},"sutil":{"permanentNumber":"99","firstName":"Adrian","lastName":"Sutil","firstYear":2007,"nationality":"German","constructor":"Sauber","wins":0},"kobayashi":{"permanentNumber":"10","firstName":"Kamui","lastName":"Kobayashi","firstYear":2009,"nationality":"Japanese","constructor":"Caterham","wins":0},"grosjean":{"permanentNumber":"8","firstName":"Romain","lastName":"Grosjean","firstYear":2009,"nationality":"French","constructor":"Haas F1 Team","wins":0},"hulkenberg":{"permanentNumber":"27","firstName":"Nico","lastName":"Hülkenberg","firstYear":2010,"nationality":"German","constructor":"Aston Martin","wins":0},"perez":{"permanentNumber":"11","firstName":"Sergio","lastName":"Pérez","firstYear":2011,"nationality":"Mexican","constructor":"Red Bull","wins":3},"maldonado":{"permanentNumber":"13","firstName":"Pastor","lastName":"Maldonado","firstYear":2011,"nationality":"Venezuelan","constructor":"Lotus F1","wins":1},"ricciardo":{"permanentNumber":"3","firstName":"Daniel","lastName":"Ricciardo","firstYear":2011,"nationality":"Australian","constructor":"McLaren","wins":8},"vergne":{"permanentNumber":"25","firstName":"Jean-Éric","lastName":"Vergne","firstYear":2012,"nationality":"French","constructor":"Toro Rosso","wins":0},"gutierrez":{"permanentNumber":"21","firstName":"Esteban","lastName":"Gutiérrez","firstYear":2013,"nationality":"Mexican","constructor":"Haas F1 Team","wins":0},"bottas":{"permanentNumber":"77","firstName":"Valtteri","lastName":"Bottas","firstYear":2013,"nationality":"Finnish","constructor":"Alfa Romeo","wins":10},"jules_bianchi":{"permanentNumber":"17","firstName":"Jules","lastName":"Bianchi","firstYear":2013,"nationality":"French","constructor":"Marussia","wins":0},"chilton":{"permanentNumber":"4","firstName":"Max","lastName":"Chilton","firstYear":2013,"nationality":"British","constructor":"Marussia","wins":0},"kevin_magnussen":{"permanentNumber":"20","firstName":"Kevin","lastName":"Magnussen","firstYear":2014,"nationality":"Danish","constructor":"Haas F1 Team","wins":0},"kvyat":{"permanentNumber":"26","firstName":"Daniil","lastName":"Kvyat","firstYear":2014,"nationality":"Russian","constructor":"AlphaTauri","wins":0},"ericsson":{"permanentNumber":"9","firstName":"Marcus","lastName":"Ericsson","firstYear":2014,"nationality":"Swedish","constructor":"Sauber","wins":0},"stevens":{"permanentNumber":"28","firstName":"Will","lastName":"Stevens","firstYear":2014,"nationality":"British","constructor":"Manor Marussia","wins":0},"lotterer":{"permanentNumber":"45","firstName":"André","lastName":"Lotterer","firstYear":2014,"nationality":"German","constructor":"Caterham","wins":0},"max_verstappen":{"permanentNumber":"33","firstName":"Max","lastName":"Verstappen","firstYear":2015,"nationality":"Dutch","constructor":"Red Bull","wins":25},"nasr":{"permanentNumber":"12","firstName":"Felipe","lastName":"Nasr","firstYear":2015,"nationality":"Brazilian","constructor":"Sauber","wins":0},"sainz":{"permanentNumber":"55","firstName":"Carlos","lastName":"Sainz","firstYear":2015,"nationality":"Spanish","constructor":"Ferrari","wins":0},"merhi":{"permanentNumber":"98","firstName":"Roberto","lastName":"Merhi","firstYear":2015,"nationality":"Spanish","constructor":"Manor Marussia","wins":0},"rossi":{"permanentNumber":"53","firstName":"Alexander","lastName":"Rossi","firstYear":2015,"nationality":"American","constructor":"Manor Marussia","wins":0},"jolyon_palmer":{"permanentNumber":"30","firstName":"Jolyon","lastName":"Palmer","firstYear":2016,"nationality":"British","constructor":"Renault","wins":0},"wehrlein":{"permanentNumber":"94","firstName":"Pascal","lastName":"Wehrlein","firstYear":2016,"nationality":"German","constructor":"Sauber","wins":0},"vandoorne":{"permanentNumber":"2","firstName":"Stoffel","lastName":"Vandoorne","firstYear":2016,"nationality":"Belgian","constructor":"McLaren","wins":0},"ocon":{"permanentNumber":"31","firstName":"Esteban","lastName":"Ocon","firstYear":2016,"nationality":"French","constructor":"Alpine F1 Team","wins":1},"haryanto":{"permanentNumber":"88","firstName":"Rio","lastName":"Haryanto","firstYear":2016,"nationality":"Indonesian","constructor":"Manor Marussia","wins":0},"stroll":{"permanentNumber":"18","firstName":"Lance","lastName":"Stroll","firstYear":2017,"nationality":"Canadian","constructor":"Aston Martin","wins":0},"gasly":{"permanentNumber":"10","firstName":"Pierre","lastName":"Gasly","firstYear":2017,"nationality":"French","constructor":"AlphaTauri","wins":1},"giovinazzi":{"permanentNumber":"99","firstName":"Antonio","lastName":"Giovinazzi","firstYear":2017,"nationality":"Italian","constructor":"Alfa Romeo","wins":0},"brendon_hartley":{"permanentNumber":"28","firstName":"Brendon","lastName":"Hartley","firstYear":2017,"nationality":"New Zealander","constructor":"Toro Rosso","wins":0},"leclerc":{"permanentNumber":"16","firstName":"Charles","lastName":"Leclerc","firstYear":2018,"nationality":"Monegasque","constructor":"Ferrari","wins":4},"sirotkin":{"permanentNumber":"35","firstName":"Sergey","lastName":"Sirotkin","firstYear":2018,"nationality":"Russian","constructor":"Williams","wins":0},"albon":{"permanentNumber":"23","firstName":"Alexander","lastName":"Albon","firstYear":2019,"nationality":"Thai","constructor":"Williams","wins":0},"norris":{"permanentNumber":"4","firstName":"Lando","lastName":"Norris","firstYear":2019,"nationality":"British","constructor":"McLaren","wins":0},"russell":{"permanentNumber":"63","firstName":"George","lastName":"Russell","firstYear":2019,"nationality":"British","constructor":"Mercedes","wins":0},"latifi":{"permanentNumber":"6","firstName":"Nicholas","lastName":"Latifi","firstYear":2020,"nationality":"Canadian","constructor":"Williams","wins":0},"aitken":{"permanentNumber":"89","firstName":"Jack","lastName":"Aitken","firstYear":2020,"nationality":"British","constructor":"Williams","wins":0},"pietro_fittipaldi":{"permanentNumber":"51","firstName":"Pietro","lastName":"Fittipaldi","firstYear":2020,"nationality":"Brazilian","constructor":"Haas F1 Team","wins":0},"tsunoda":{"permanentNumber":"22","firstName":"Yuki","lastName":"Tsunoda","firstYear":2021,"nationality":"Japanese","constructor":"AlphaTauri","wins":0},"mick_schumacher":{"permanentNumber":"47","firstName":"Mick","lastName":"Schumacher","firstYear":2021,"nationality":"German","constructor":"Haas F1 Team","wins":0},"mazepin":{"permanentNumber":"9","firstName":"Nikita","lastName":"Mazepin","firstYear":2021,"nationality":"Russian","constructor":"Haas F1 Team","wins":0},"zhou":{"permanentNumber":"24","firstName":"Guanyu","lastName":"Zhou","firstYear":2022,"nationality":"Chinese","constructor":"Alfa Romeo","wins":0}} \ No newline at end of file +{"button":{"permanentNumber":"22","firstName":"Jenson","lastName":"Button","age":42,"firstYear":2000,"nationality":"British","constructor":"McLaren","wins":15},"raikkonen":{"permanentNumber":"7","firstName":"Kimi","lastName":"Räikkönen","age":42,"firstYear":2001,"nationality":"Finnish","constructor":"Alfa Romeo","wins":21},"alonso":{"permanentNumber":"14","firstName":"Fernando","lastName":"Alonso","age":40,"firstYear":2001,"nationality":"Spanish","constructor":"Alpine F1 Team","wins":32},"massa":{"permanentNumber":"19","firstName":"Felipe","lastName":"Massa","age":41,"firstYear":2002,"nationality":"Brazilian","constructor":"Williams","wins":11},"kubica":{"permanentNumber":"88","firstName":"Robert","lastName":"Kubica","age":37,"firstYear":2006,"nationality":"Polish","constructor":"Alfa Romeo","wins":1},"rosberg":{"permanentNumber":"6","firstName":"Nico","lastName":"Rosberg","age":36,"firstYear":2006,"nationality":"German","constructor":"Mercedes","wins":23},"hamilton":{"permanentNumber":"44","firstName":"Lewis","lastName":"Hamilton","age":37,"firstYear":2007,"nationality":"British","constructor":"Mercedes","wins":103},"vettel":{"permanentNumber":"5","firstName":"Sebastian","lastName":"Vettel","age":34,"firstYear":2007,"nationality":"German","constructor":"Aston Martin","wins":53},"sutil":{"permanentNumber":"99","firstName":"Adrian","lastName":"Sutil","age":39,"firstYear":2007,"nationality":"German","constructor":"Sauber","wins":0},"kobayashi":{"permanentNumber":"10","firstName":"Kamui","lastName":"Kobayashi","age":35,"firstYear":2009,"nationality":"Japanese","constructor":"Caterham","wins":0},"grosjean":{"permanentNumber":"8","firstName":"Romain","lastName":"Grosjean","age":36,"firstYear":2009,"nationality":"French","constructor":"Haas F1 Team","wins":0},"hulkenberg":{"permanentNumber":"27","firstName":"Nico","lastName":"Hülkenberg","age":34,"firstYear":2010,"nationality":"German","constructor":"Aston Martin","wins":0},"perez":{"permanentNumber":"11","firstName":"Sergio","lastName":"Pérez","age":32,"firstYear":2011,"nationality":"Mexican","constructor":"Red Bull","wins":3},"maldonado":{"permanentNumber":"13","firstName":"Pastor","lastName":"Maldonado","age":37,"firstYear":2011,"nationality":"Venezuelan","constructor":"Lotus F1","wins":1},"ricciardo":{"permanentNumber":"3","firstName":"Daniel","lastName":"Ricciardo","age":32,"firstYear":2011,"nationality":"Australian","constructor":"McLaren","wins":8},"vergne":{"permanentNumber":"25","firstName":"Jean-Éric","lastName":"Vergne","age":32,"firstYear":2012,"nationality":"French","constructor":"Toro Rosso","wins":0},"gutierrez":{"permanentNumber":"21","firstName":"Esteban","lastName":"Gutiérrez","age":30,"firstYear":2013,"nationality":"Mexican","constructor":"Haas F1 Team","wins":0},"bottas":{"permanentNumber":"77","firstName":"Valtteri","lastName":"Bottas","age":32,"firstYear":2013,"nationality":"Finnish","constructor":"Alfa Romeo","wins":10},"jules_bianchi":{"permanentNumber":"17","firstName":"Jules","lastName":"Bianchi","age":32,"firstYear":2013,"nationality":"French","constructor":"Marussia","wins":0},"chilton":{"permanentNumber":"4","firstName":"Max","lastName":"Chilton","age":31,"firstYear":2013,"nationality":"British","constructor":"Marussia","wins":0},"kevin_magnussen":{"permanentNumber":"20","firstName":"Kevin","lastName":"Magnussen","age":29,"firstYear":2014,"nationality":"Danish","constructor":"Haas F1 Team","wins":0},"kvyat":{"permanentNumber":"26","firstName":"Daniil","lastName":"Kvyat","age":28,"firstYear":2014,"nationality":"Russian","constructor":"AlphaTauri","wins":0},"ericsson":{"permanentNumber":"9","firstName":"Marcus","lastName":"Ericsson","age":31,"firstYear":2014,"nationality":"Swedish","constructor":"Sauber","wins":0},"stevens":{"permanentNumber":"28","firstName":"Will","lastName":"Stevens","age":30,"firstYear":2014,"nationality":"British","constructor":"Manor Marussia","wins":0},"lotterer":{"permanentNumber":"45","firstName":"André","lastName":"Lotterer","age":40,"firstYear":2014,"nationality":"German","constructor":"Caterham","wins":0},"max_verstappen":{"permanentNumber":"33","firstName":"Max","lastName":"Verstappen","age":24,"firstYear":2015,"nationality":"Dutch","constructor":"Red Bull","wins":25},"nasr":{"permanentNumber":"12","firstName":"Felipe","lastName":"Nasr","age":29,"firstYear":2015,"nationality":"Brazilian","constructor":"Sauber","wins":0},"sainz":{"permanentNumber":"55","firstName":"Carlos","lastName":"Sainz","age":27,"firstYear":2015,"nationality":"Spanish","constructor":"Ferrari","wins":0},"merhi":{"permanentNumber":"98","firstName":"Roberto","lastName":"Merhi","age":31,"firstYear":2015,"nationality":"Spanish","constructor":"Manor Marussia","wins":0},"rossi":{"permanentNumber":"53","firstName":"Alexander","lastName":"Rossi","age":30,"firstYear":2015,"nationality":"American","constructor":"Manor Marussia","wins":0},"jolyon_palmer":{"permanentNumber":"30","firstName":"Jolyon","lastName":"Palmer","age":31,"firstYear":2016,"nationality":"British","constructor":"Renault","wins":0},"wehrlein":{"permanentNumber":"94","firstName":"Pascal","lastName":"Wehrlein","age":27,"firstYear":2016,"nationality":"German","constructor":"Sauber","wins":0},"vandoorne":{"permanentNumber":"2","firstName":"Stoffel","lastName":"Vandoorne","age":30,"firstYear":2016,"nationality":"Belgian","constructor":"McLaren","wins":0},"ocon":{"permanentNumber":"31","firstName":"Esteban","lastName":"Ocon","age":25,"firstYear":2016,"nationality":"French","constructor":"Alpine F1 Team","wins":1},"haryanto":{"permanentNumber":"88","firstName":"Rio","lastName":"Haryanto","age":29,"firstYear":2016,"nationality":"Indonesian","constructor":"Manor Marussia","wins":0},"stroll":{"permanentNumber":"18","firstName":"Lance","lastName":"Stroll","age":23,"firstYear":2017,"nationality":"Canadian","constructor":"Aston Martin","wins":0},"gasly":{"permanentNumber":"10","firstName":"Pierre","lastName":"Gasly","age":26,"firstYear":2017,"nationality":"French","constructor":"AlphaTauri","wins":1},"giovinazzi":{"permanentNumber":"99","firstName":"Antonio","lastName":"Giovinazzi","age":28,"firstYear":2017,"nationality":"Italian","constructor":"Alfa Romeo","wins":0},"brendon_hartley":{"permanentNumber":"28","firstName":"Brendon","lastName":"Hartley","age":32,"firstYear":2017,"nationality":"New Zealander","constructor":"Toro Rosso","wins":0},"leclerc":{"permanentNumber":"16","firstName":"Charles","lastName":"Leclerc","age":24,"firstYear":2018,"nationality":"Monegasque","constructor":"Ferrari","wins":4},"sirotkin":{"permanentNumber":"35","firstName":"Sergey","lastName":"Sirotkin","age":26,"firstYear":2018,"nationality":"Russian","constructor":"Williams","wins":0},"albon":{"permanentNumber":"23","firstName":"Alexander","lastName":"Albon","age":26,"firstYear":2019,"nationality":"Thai","constructor":"Williams","wins":0},"norris":{"permanentNumber":"4","firstName":"Lando","lastName":"Norris","age":22,"firstYear":2019,"nationality":"British","constructor":"McLaren","wins":0},"russell":{"permanentNumber":"63","firstName":"George","lastName":"Russell","age":24,"firstYear":2019,"nationality":"British","constructor":"Mercedes","wins":0},"latifi":{"permanentNumber":"6","firstName":"Nicholas","lastName":"Latifi","age":26,"firstYear":2020,"nationality":"Canadian","constructor":"Williams","wins":0},"aitken":{"permanentNumber":"89","firstName":"Jack","lastName":"Aitken","age":26,"firstYear":2020,"nationality":"British","constructor":"Williams","wins":0},"pietro_fittipaldi":{"permanentNumber":"51","firstName":"Pietro","lastName":"Fittipaldi","age":25,"firstYear":2020,"nationality":"Brazilian","constructor":"Haas F1 Team","wins":0},"tsunoda":{"permanentNumber":"22","firstName":"Yuki","lastName":"Tsunoda","age":22,"firstYear":2021,"nationality":"Japanese","constructor":"AlphaTauri","wins":0},"mick_schumacher":{"permanentNumber":"47","firstName":"Mick","lastName":"Schumacher","age":23,"firstYear":2021,"nationality":"German","constructor":"Haas F1 Team","wins":0},"mazepin":{"permanentNumber":"9","firstName":"Nikita","lastName":"Mazepin","age":23,"firstYear":2021,"nationality":"Russian","constructor":"Haas F1 Team","wins":0},"zhou":{"permanentNumber":"24","firstName":"Guanyu","lastName":"Zhou","age":23,"firstYear":2022,"nationality":"Chinese","constructor":"Alfa Romeo","wins":0}} \ No newline at end of file