diff --git a/Back/skydiveLogs-api.Data/AircraftRepository.cs b/Back/skydiveLogs-api.Data/AircraftRepository.cs index c615c8a..7b9c57d 100644 --- a/Back/skydiveLogs-api.Data/AircraftRepository.cs +++ b/Back/skydiveLogs-api.Data/AircraftRepository.cs @@ -1,13 +1,12 @@ -using skydiveLogs_api.Data.Interface; -using skydiveLogs_api.Model; -using System; -using System.Collections.Generic; -using System.Text; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using System.IO; +using System.Collections.Generic; using System.Linq; +using LiteDB; + +using skydiveLogs_api.Data.Interface; +using skydiveLogs_api.Model; + + namespace skydiveLogs_api.Data { public class AircraftRepository : IAircraftRepository @@ -16,11 +15,11 @@ namespace skydiveLogs_api.Data { IEnumerable result = new List(); - using (StreamReader file = File.OpenText(@"Data/Aircraft.json")) - using (JsonTextReader reader = new JsonTextReader(file)) + using (var db = new LiteDatabase(@".\Data\MyData.db")) { - var jsonResult = (JArray)JToken.ReadFrom(reader); - result = jsonResult.ToObject>(); + var col = db.GetCollection("Aircraft"); + + result = col.FindAll().ToList(); } return result; @@ -30,12 +29,11 @@ namespace skydiveLogs_api.Data { Aircraft result; - using (StreamReader file = File.OpenText(@"Data/Aircraft.json")) - using (JsonTextReader reader = new JsonTextReader(file)) + using (var db = new LiteDatabase(@".\Data\MyData.db")) { - var jsonResult = (JArray)JToken.ReadFrom(reader); - var tmp = jsonResult.ToObject>(); - result = tmp.SingleOrDefault(t => t.Id == id); + var col = db.GetCollection("Aircraft"); + + result = col.FindById(new BsonValue(id)); } return result; diff --git a/Back/skydiveLogs-api.Data/Data/Aircraft.json b/Back/skydiveLogs-api.Data/Data/Aircraft.json deleted file mode 100644 index f910103..0000000 --- a/Back/skydiveLogs-api.Data/Data/Aircraft.json +++ /dev/null @@ -1,22 +0,0 @@ -[ - { - "id": 1, - "name": "Pilatus" - }, - { - "id": 1, - "name": "Caravan" - }, - { - "id": 1, - "name": "Skyvan" - }, - { - "id": 1, - "name": "Twin Otter" - }, - { - "id": 1, - "name": "PAC 750" - } -] \ No newline at end of file diff --git a/Back/skydiveLogs-api.Data/Data/DropZone.json b/Back/skydiveLogs-api.Data/Data/DropZone.json deleted file mode 100644 index 33f6318..0000000 --- a/Back/skydiveLogs-api.Data/Data/DropZone.json +++ /dev/null @@ -1,975 +0,0 @@ -[ - { - "id": 1, - "latitude": "43.4305", - "longitude": "5.40197", - "name": "iFLY - Aix/Marseille", - "address": "Decathlon Village - La Petite Bastide
Avenue des Chabauds, RN8
13320 Bouc-Bel-Air", - "website": "www.iflyfrance.com", - "email": "contact@iflyaixmarseille.fr", - "type": [ - "tunnel" - ] - }, - { - "id": 1, - "latitude": "48.42851765", - "longitude": "4.48127962577103", - "name": "Brienne - Aube Parachutisme", - "address": "Aérodrome de Brienne Le Château
10500 Préçy-Saint-Martin", - "website": "www.aubeparachutisme.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "50.78266", - "longitude": "3.00485", - "name": "Ice Mountain Adventure Park", - "address": "Rue de Capelle 16
7780 Comines-Warneton - Belgique", - "website": "www.ice-mountain.com", - "email": "indoorskydiving@ice-mountain.com", - "type": [ - "tunnel" - ] - }, - { - "id": 1, - "latitude": "-21.82105", - "longitude": "165.86077", - "name": "La Foa", - "address": "Aérodrome de La Foa Ouatom (Nouvelle-Calédonie)", - "website": "www.cepnc.com", - "email": "cepnc1@gmail.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "44.00109", - "longitude": "4.75815", - "name": "Skydive Pujaut", - "address": "", - "website": "www.skydive-pujaut.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "43.60392", - "longitude": "3.91888", - "name": "Montpellier - Twistair", - "address": "Odysseum
34 000 Montpellier", - "website": "www.twist-air.com", - "email": "", - "type": [ - "tunnel" - ] - }, - { - "id": 1, - "latitude": "44.45564", - "longitude": "6.03411", - "name": "Gap - CERPS", - "address": "Aérodrome de Gap Tallard
630 rue Pierre-Georges Latécoère
05130 Tallard", - "website": "parachutismegap.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "45.898776", - "longitude": "6.838590", - "name": "Rock Drop", - "address": "", - "website": "www.rock-drop.com", - "email": "contact@rock-drop.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "51.01451", - "longitude": "5.52507", - "name": "Zwartberg Skydive Flanders", - "address": "Vliegplein 1, 3600 Genk", - "website": "www.skydiveflanders.be", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "51.00225", - "longitude": "5.06817", - "name": "Schaffen Skydive Flanders", - "address": "Nieuwe Dijkstraat 44, 3290 Schaffen", - "website": "www.skydiveflanders.be", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "50.84966", - "longitude": "3.14724", - "name": "Moorsele Skydive Flanders", - "address": "Ledegemstraat 140, 8560 Moorsele", - "website": "www.skydiveflanders.be", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "46.82826", - "longitude": "4.82633", - "name": "Châlon sur Sâone - Sky Circus", - "address": "71530 Aérodrome de Chalon-Champforgeuil", - "website": "www.chutelibre-shop.fr", - "email": "", - "type": [ - "tunnel" - ] - }, - { - "id": 1, - "latitude": "43.21733", - "longitude": "0.07492", - "name": "Tarbes - CEP de la Bigorre", - "address": "Aérodrome de Laloubère
65310 Laloubère", - "website": "www.parachutisme-tarbes.fr", - "email": "cepb65@gmail.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "49.86957", - "longitude": "2.38775", - "name": "Amiens - Amiens Parachutisme", - "address": "Aérodrome d'Amiens-Glisy
Rue Robur le Conquérant
80440 Glisy", - "website": "www.sauterenparachute.com", - "email": "contact@sauterenparachute.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "47.27358", - "longitude": "5.07270", - "name": "Dijon - BFCP", - "address": "Aéroport de Dijon Bourgogne
1925 Rue de l'aviation
21600 Ouges", - "website": "", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "41.65905", - "longitude": "8.89382", - "name": "Corse - EP du Valinco", - "address": "Aérodrome Tavaria - BP28
20110 Propriano", - "website": "www.corseparachutisme.fr", - "email": "info@skydivecorsica.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "45.86880", - "longitude": "5.18445", - "name": "Lyon - Ciel dAventure", - "address": "20 rue Caillet
69001 Lyon", - "website": "www.cieldav.com", - "email": "contact@cieldav.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "46.59473", - "longitude": "7.09306", - "name": "Château-d'Oex - EPCO", - "address": "l'aérodrome de la Gruyère, à Epagny et l'aérodrome de Colombier", - "website": "www.skydive-gruyere.ch", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "43.42730", - "longitude": "-0.28856", - "name": "Pau - Paradise 64", - "address": "Aérodrome de Lasclaveries
64450 Lasclaverie", - "website": "www.paradise64.fr", - "email": "contact@paradise64.fr", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "-21.609549", - "longitude": "165.400054", - "name": "Nouméa - Nouméa Skydive", - "address": "BP 18545
98857 Nouméa Cedex", - "website": "www.parachutisme.nc", - "email": "max@parachutisme.nc", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "-21.32013", - "longitude": "55.42761", - "name": "La Réunion - Para-club de Bourbon", - "address": "Aérodrome de Pierrefonds
97410 St Pierre", - "website": "www.para-bourbon.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "37.29609", - "longitude": "-6.16122", - "name": "Séville - Skydive Spain", - "address": "Aerodromo La Juliana
Bollullos de la Mitaciu00f3n", - "website": "www.skydivespain.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "39.99553", - "longitude": "0.02519", - "name": "Castellon - Skytime", - "address": "Aérodrome El PinarCamino de La Plana
12100 El Grao", - "website": "www.skytime.info", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "37.14756", - "longitude": "-8.58114", - "name": "Algarve - Skydive Algarve", - "address": "Aerodrome de Portimão - Montes de Alvor
8500-059 Portimão/Alvor
Portugal", - "website": "www.skydivealgarve.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "42.25968", - "longitude": "3.10908", - "name": "Empuriabrava - Skydive Empuria", - "address": "Ampuriabrava - Gerona - 17487", - "website": "www.skydiveempuriabrava.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "50.15202", - "longitude": "4.38704", - "name": "Cerfontaine - Skydive Cerfontaine", - "address": "Route des Lacs
50 - B5630 Cerfontaine", - "website": "www.skydivecerfontaine.be", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "46.2575", - "longitude": "6.9867", - "name": "Bex - Flying Devil", - "address": "Aérodrome de Bex
1880 Bex Suisse", - "website": "www.Flying-Devil.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "50.47998", - "longitude": "5.91407", - "name": "Spa - Skydive Spa", - "address": "122 route de la sauvenière
B-4900 Spa", - "website": "www.skydivespa.be", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "42.257868", - "longitude": "3.108497", - "name": "Empuriabrava - Windoor Realfly", - "address": "Sector Aeroclub
17486 Empuriabrava, Giron, Spain", - "website": "www.windoor-realfly.com", - "email": "Proflyer@windoor-realfly.com", - "type": [ - "tunnel" - ] - }, - { - "id": 1, - "latitude": "50.64516", - "longitude": "5.46701", - "name": "Liège - Fly-In", - "address": "8 Rue de l'aéroport
B-4460 Grâce Hollogne
Liège, Belgique", - "website": "www.fly-in.be", - "email": "", - "type": [ - "tunnel" - ] - }, - { - "id": 1, - "latitude": "50.58383", - "longitude": "3.09533", - "name": "Lille - Weembi", - "address": "730 Rue Maurice Herzog
59810 Lesquin", - "website": "www.weembi.com", - "email": "info@weembi.com", - "type": [ - "tunnel" - ] - }, - { - "id": 1, - "latitude": "45.72502", - "longitude": "4.93902", - "name": "Lyon Saint-Priest - iFLY Lyon", - "address": "Aéroport de Lyon-Bron
48 ancienne route de Grenoble
69800 Saint-Priest", - "website": "www.iflyfrance.com", - "email": "info.lyon@iflyworld.com", - "type": [ - "tunnel" - ] - }, - { - "id": 1, - "latitude": "46.22094", - "longitude": "7.35205", - "name": "Sion - Realfly", - "address": "1950 Sion
Suisse 58, Route de la Drague", - "website": "www.realfly.ch", - "email": "", - "type": [ - "tunnel" - ] - }, - { - "id": 1, - "latitude": "47.72723", - "longitude": "-2.72502", - "name": "Vannes - EPS Vannes-Bretagne", - "address": "Aérodrome de Vannes-Meucon
1-2 Rue Kersimon
56250 Monterblanc", - "website": "www.parachutisme-vannes.fr", - "email": "accueil@parachutisme-vannes.fr", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "47.25469", - "longitude": "-0.10831", - "name": "Saumur - CERPS", - "address": "118 rue des Landes
BP 33 - 49426 Saumur cedex", - "website": "www.saumur-parachutisme.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "48.55473", - "longitude": "7.78487", - "name": "Strasbourg - CERP Alsace", - "address": "Aérodrome du Polygone
67100 Strasbourg 82 rue de la Musau", - "website": "alsace-para.com", - "email": "info@alsace-para.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "47.98379", - "longitude": "3.77448", - "name": "Saint Florentin - Paris Jump", - "address": "Aérodrome de Chéu
89600 St Florentin", - "website": "www.parisjump.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "45.60574", - "longitude": "4.30375", - "name": "Saint Etienne - A.S.P.L./C.E.P.", - "address": "Aérodrome de Saint-Galmier
42330 - Saint-Galmier", - "website": "www.para42.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "45.63339", - "longitude": "-0.97613", - "name": "Royan - Europhénix 17", - "address": "Aérodrome de Royan-Médis
17600 Médis", - "website": "www.europhenix17.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "46.05209", - "longitude": "4.00329", - "name": "Roanne - Skydive Roanne", - "address": "42155 Aérodrome de Roanne", - "website": "www.skydiveroanne.fr", - "email": "info@skydiveroanne.fr", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "49.87168", - "longitude": "3.04032", - "name": "Péronne - CPPPHS", - "address": "CPPPHS SARL - BP 80051
80201 Péronne Cedex", - "website": "www.skydive-peronne.fr", - "email": "skydive.peronne@gmail.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "43.09240", - "longitude": "1.69954", - "name": "Pamiers - CEPS Ariège", - "address": "Aérodrome de Pamiers les Pujols
09101 Pamiers", - "website": "www.parachutisme-pamiers.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "43.42730", - "longitude": "-0.28856", - "name": "Pau - Parachutisme Passion", - "address": "Aérodrome
64450 Lasclaveries", - "website": "www.pau-skydive.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "47.90230", - "longitude": "2.16910", - "name": "Orléans - EPCOL", - "address": "Aéroport du Loiret
45550 - Saint Denis de l'Hôtel", - "website": "parachutisme-orleans.net", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "46.31478", - "longitude": "-0.40147", - "name": "Niort - Démenciel Parachutisme", - "address": "Aérodrome de Niort Marais - Poitevin
Avenue de Limoges - 79000 Niort", - "website": "www.demencielparachutisme.com", - "email": "contact@demencielparachutisme.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "44.07020", - "longitude": "4.14399", - "name": "Neemes - Accel-air", - "address": "Aérodrome de Nu00eemes-Courbessac
Hangar, chemin de l'aérodrome
30000 Nu00eemes Courbessac

-Aérodrome de Millau La Cavalerie
Route départemental 809
12230 La Cavalerie", - "website": "www.accel-air.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "48.59240", - "longitude": "6.24500", - "name": "Nancy - EFP Nancy Lorraine", - "address": "Aérodrome de Nancy Azelot
54210 Azelot", - "website": "www.paranancy.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "46.99906", - "longitude": "3.10917", - "name": "Nevers - CP Paris-Nevers", - "address": "Aéroport de Nevers Fourchambault
58180 Nevers", - "website": "www.paraparisnevers.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "44.14793", - "longitude": "-1.16311", - "name": "Mimizan - OJB Parachutisme", - "address": "Aérodrome de Mimizan
40200 Mimizan", - "website": "www.ojbpara.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "47.49204", - "longitude": "6.79114", - "name": "Montbéliard - EPNFC", - "address": "Aérodrome de Courcelles lès Montbéliard
25420 Courcelles", - "website": "www.epnfc.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "50.31594", - "longitude": "4.02990", - "name": "Maubeuge - CERPM", - "address": "Aérodrome de la Salmagne
59600 Vieux Reng", - "website": "www.skydivemaubeuge.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "45.65804", - "longitude": "4.91376", - "name": "Lyon - EPLC", - "address": "Rue Clément Ader
69960 Corbas", - "website": "parachutisme-lyon.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "50.46500", - "longitude": "2.82039", - "name": "Lens - CERP Lens", - "address": "Aérodrome Lens - Bénifontaine
62410 Bénifontaine", - "website": "www.lens-parachutisme.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "48.03037", - "longitude": "-0.74492", - "name": "Laval - Centre école de la Mayenne", - "address": "Parachutisme Laval
Chemin de l'Etronnier - 53000", - "website": "www.parachutismelaval.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "49.20504", - "longitude": "-1.50625", - "name": "Lessay - EP de Lessay", - "address": "Aérodrome de Lessay
30 Route de l'aérodrome
50430 Lessay", - "website": "www.aair-parachutisme.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "48.75120", - "longitude": "-3.46701", - "name": "Lannion - Septième Ciel Parachutisme", - "address": "126 rue de l'aérodrome
Pégase sud
22300 Lannion", - "website": "www.septiemeciel-parachutisme.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "49.53198", - "longitude": "0.09323", - "name": "Le Havre - Abeille Parachutisme", - "address": "Aéroport du Havre/Octeville
76620 Le Havre", - "website": "www.abeilleparachutisme.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "46.62535", - "longitude": "1.08696", - "name": "Le Blanc - EFP Le Blanc", - "address": "Aérodrome - 36300 Le Blanc", - "website": "www.efpleblanc.com", - "email": "info@efpleblanc.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "46.69947", - "longitude": "-1.37625", - "name": "La Roche sur Yon - Vendée Chute Libre", - "address": "Aérodrome René Couzinet
85000 La Roche-sur-Yon", - "website": "www.vendee-chutelibre.com", - "email": "vendeechutelibre@orange.fr", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "45.36632", - "longitude": "5.32725", - "name": "Grenoble - CEP Grenoble", - "address": "Aérodrome de Grenoble Alpes Isère
38590 - St Etienne de St Geoirs", - "website": "www.parachutisme38.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "48.05227", - "longitude": "-3.66317", - "name": "Guiscriff - EPBA", - "address": "Aérodrome Bretagne-Atlantique de Scaebr-Guiscriff Pont Person
56560 Guiscriff", - "website": "epba-parachutisme.sportsregions.fr", - "email": "epbaguiscriff@gmail.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "44.56609", - "longitude": "-0.05352", - "name": "La Réole - Espace Chute Libre", - "address": "Aérodrome de La Réole - 33190", - "website": "www.parachute-gironde.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "49.66560", - "longitude": "2.96916", - "name": "Frétoy le Château - Skydive Frétoy", - "address": "Aérodrome
Le Bois de Ham
60640 Frêtoy le château", - "website": "www.skydivefretoy.com", - "email": "contact@skydivefretoy.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "49.88459", - "longitude": "1.08747", - "name": "Dieppe - Air Libre Parachutisme", - "address": "Aérodrome de Dieppe
76550 St Aubin sur Scie", - "website": "www.airlibre-parachutisme.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "45.63283", - "longitude": "5.88416", - "name": "Chambéry - EP de Savoie", - "address": "Aéroport de Chambéry
73420 Le Viviers du Lac", - "website": "www.savoieparachutisme.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "46.82828", - "longitude": "4.82631", - "name": "Châlon sur Sâone - Parachutisme 71", - "address": "Aérodrome de Champforgeuil
71530 Châlon sur Sâone", - "website": "www.parachutisme71.com", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "44.34905", - "longitude": "1.47618", - "name": "Cahors - CEP de Cahors", - "address": "Aérodrome Cahors Lalbenque
46230 Cieurac", - "website": "www.parachutisme.com", - "email": "cep46@wanadoo.fr", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "43.27794", - "longitude": "0.51819", - "name": "Castelnau Magnoac - Air 65", - "address": "5 chemin de l'aérodrome
65230 Castelnau-Magnoac", - "website": "www.air65-parachutisme.fr", - "email": "infos@air65.fr", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "44.30560", - "longitude": "1.08067", - "name": "Bouloc - EP Midi-Pyrénées", - "address": "Aérodrome Cardenal
82110 Bouloc", - "website": "www.bouloc-skydive.com", - "email": "accueil@bouloc-skydive.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "50.68738", - "longitude": "3.08163", - "name": "Bondues - EFP Lille Bondues", - "address": "98 Parc de l'aérodrome
59910 Bondues", - "website": "www.parachutisme-lille.fr", - "email": "contact@parachutisme-lille.fr", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "47.20555", - "longitude": "6.07627", - "name": "Besançon - EP de Besançon Franche Comté", - "address": "Route de l'aérodrome
25660 La Vèze", - "email": "para.besac@wanadoo.fr", - "website": "www.parabesancon.fr", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "44.59828", - "longitude": "-1.11564", - "name": "Arcachon - Arcachon Parachutisme", - "address": "Aérodrome Villemarie
33260 La Teste de Buch", - "website": "www.arcachon-parachutisme.fr", - "email": "info@arcachon-parachutisme.fr", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "46.19398", - "longitude": "6.26921", - "name": "Annemasse - Parachutisme 74", - "address": "Aérodrome d'Annemasse - 74100 Annemasse", - "website": "www.parachutisme74.com", - "email": "info@parachutisme74.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "48.89582", - "longitude": "2.38941", - "name": "Paris - iFLY Paris", - "address": "La Villette
30 avenue Corentin Cariou
75019 Paris", - "website": "www.iflyfrance.com", - "email": "info.paris@iflyworld.com", - "type": [ - "tunnel" - ] - }, - { - "id": 1, - "latitude": "44.45828", - "longitude": "6.03739", - "name": "Gap - Skydive Center", - "address": "Aérodrome de Gap Tallard
05130 Tallard", - "website": "www.skydivecenter.fr", - "email": "", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "44.45843", - "longitude": "6.03631", - "name": "Gap - On'Air", - "address": "Aérodrome de Gap-Tallard
05130 Tallard", - "website": "www.onairtunnel.com", - "email": "contact@onairtunnel.com", - "type": [ - "tunnel" - ] - }, - { - "id": 1, - "latitude": "48.9569381", - "longitude": "2.2048741", - "name": "Argenteuil - Aerokart", - "address": "199/203 Route de Pontoise
95100 Argenteuil", - "website": "www.aerokart.com", - "email": "planning@aerokart.com", - "type": [ - "tunnel" - ] - }, - { - "id": 1, - "latitude": "43.17301", - "longitude": "2.73667", - "name": "Lézignan Corbières - Flyzone", - "address": "Aérodrome de Lézignan-Corbières - 11200", - "website": "www.flyzone.fr", - "email": "", - "type": [ - "dz", - "tunnel" - ] - }, - { - "id": 1, - "latitude": "43.38849", - "longitude": "6.37716", - "name": "Le Luc - C.E.P. Côte d'Azur", - "address": "83340 Le Cannet des Maures", - "website": "www.skydivecepca.com", - "email": "cepcaleluc@gmail.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "50.95764", - "longitude": "1.95463", - "name": "Calais - Para Groupe Jean Bart", - "address": "Rue Zamenhoff
59240 Dunkerque", - "website": "www.parachutisme-nord.com", - "email": "resa@parachutisme-nord.com", - "type": [ - "dz" - ] - }, - { - "id": 1, - "latitude": "44.17662", - "longitude": "0.58971", - "name": "Agen - E.P. Agen", - "address": "Aérodrome Agen la Garenne
47520 Le Passage", - "website": "www.agen-parachutisme.org", - "email": "", - "type": [ - "dz" - ] - } -] \ No newline at end of file diff --git a/Back/skydiveLogs-api.Data/Data/Gear.json b/Back/skydiveLogs-api.Data/Data/Gear.json deleted file mode 100644 index 7680907..0000000 --- a/Back/skydiveLogs-api.Data/Data/Gear.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "id": 1, - "name": "Javelin", - "manufacturer": "Sun Path", - "minSize": 120, - "maxSize": 135, - "AAD": "Cypress 2", - "mainCanopy": "Pilot 150", - "reserveCanopy": "Techno 128" - } -] \ No newline at end of file diff --git a/Back/skydiveLogs-api.Data/Data/Jump.json b/Back/skydiveLogs-api.Data/Data/Jump.json deleted file mode 100644 index 52991fe..0000000 --- a/Back/skydiveLogs-api.Data/Data/Jump.json +++ /dev/null @@ -1,13 +0,0 @@ -[ - { - "id": 1, - "jumpTypeId" : 1, - "aircraftId" : 1, - "dropZoneId" : 1, - "gearId" : 1, - "exitAltitude" : "4000", - "deployAltitude" : "1500", - "withCutaway" : false, - "notes" : "" - } -] \ No newline at end of file diff --git a/Back/skydiveLogs-api.Data/Data/JumpType.json b/Back/skydiveLogs-api.Data/Data/JumpType.json deleted file mode 100644 index 075740d..0000000 --- a/Back/skydiveLogs-api.Data/Data/JumpType.json +++ /dev/null @@ -1,46 +0,0 @@ -[ - { - "id": 1, - "name": "PAC" - }, - { - "id": 1, - "name": "RW 4" - }, - { - "id": 1, - "name": "RW 8" - }, - { - "id": 1, - "name": "RW X" - }, - { - "id": 1, - "name": "FreeFly" - }, - { - "id": 1, - "name": "FreeStyle" - }, - { - "id": 1, - "name": "Canopy" - }, - { - "id": 1, - "name": "Track/Trace" - }, - { - "id": 1, - "name": "Wingsuit 1" - }, - { - "id": 1, - "name": "Wingsuit 2" - }, - { - "id": 1, - "name": "Wingsuit 3" - } -] \ No newline at end of file diff --git a/Back/skydiveLogs-api.Data/DropZoneRepository.cs b/Back/skydiveLogs-api.Data/DropZoneRepository.cs index 4a7348d..559f874 100644 --- a/Back/skydiveLogs-api.Data/DropZoneRepository.cs +++ b/Back/skydiveLogs-api.Data/DropZoneRepository.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; -using System.IO; using System.Linq; + using LiteDB; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; + using skydiveLogs_api.Data.Interface; using skydiveLogs_api.Model; + namespace skydiveLogs_api.Data { public class DropZoneRepository : IDropZoneRepository @@ -15,24 +15,11 @@ namespace skydiveLogs_api.Data { IEnumerable result = new List(); - //using (StreamReader file = File.OpenText(@"Data/DropZone.json")) - //using (JsonTextReader reader = new JsonTextReader(file)) - //{ - // var jsonResult = (JArray)JToken.ReadFrom(reader); - // result = jsonResult.ToObject>(); - //} - using (var db = new LiteDatabase(@".\Data\MyData.db")) { - // Get a collection (or create, if doesn't exist) var col = db.GetCollection("DropZone"); result = col.FindAll().ToList(); - //foreach (var item in result) - //{ - // item.Id = 0; - // col.Insert(item); - //} } return result; @@ -42,12 +29,11 @@ namespace skydiveLogs_api.Data { DropZone result; - using (StreamReader file = File.OpenText(@"Data/DropZone.json")) - using (JsonTextReader reader = new JsonTextReader(file)) + using (var db = new LiteDatabase(@".\Data\MyData.db")) { - var jsonResult = (JArray)JToken.ReadFrom(reader); - var tmp = jsonResult.ToObject>(); - result = tmp.SingleOrDefault(t => t.Id == id); + var col = db.GetCollection("DropZone"); + + result = col.FindById(new BsonValue(id)); } return result; diff --git a/Back/skydiveLogs-api.Data/GearRepository.cs b/Back/skydiveLogs-api.Data/GearRepository.cs index 280ac3e..dea28de 100644 --- a/Back/skydiveLogs-api.Data/GearRepository.cs +++ b/Back/skydiveLogs-api.Data/GearRepository.cs @@ -1,11 +1,43 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; +using System.Linq; + +using LiteDB; + using skydiveLogs_api.Data.Interface; +using skydiveLogs_api.Model; + namespace skydiveLogs_api.Data { public class GearRepository : IGearRepository { + public IEnumerable GetAllGears() + { + IEnumerable result = new List(); + + using (var db = new LiteDatabase(@".\Data\MyData.db")) + { + var col = db.GetCollection("Gear"); + + result = col.FindAll().ToList(); + } + + return result; + } + + public Gear GetGearById(int id) + { + Gear result; + + using (var db = new LiteDatabase(@".\Data\MyData.db")) + { + var col = db.GetCollection("Gear"); + + result = col.FindById(new BsonValue(id)); + } + + return result; + } + } } diff --git a/Back/skydiveLogs-api.Data/JumpRepository.cs b/Back/skydiveLogs-api.Data/JumpRepository.cs index f60255f..731b2cb 100644 --- a/Back/skydiveLogs-api.Data/JumpRepository.cs +++ b/Back/skydiveLogs-api.Data/JumpRepository.cs @@ -1,10 +1,11 @@ using System.Collections.Generic; +using System.Linq; + +using LiteDB; + using skydiveLogs_api.Data.Interface; using skydiveLogs_api.Model; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using System.IO; -using System.Linq; + namespace skydiveLogs_api.Data { @@ -14,11 +15,11 @@ namespace skydiveLogs_api.Data { IEnumerable result = new List(); - using (StreamReader file = File.OpenText(@"Data/Jump.json")) - using (JsonTextReader reader = new JsonTextReader(file)) + using (var db = new LiteDatabase(@".\Data\MyData.db")) { - var jsonResult = (JArray)JToken.ReadFrom(reader); - result = jsonResult.ToObject>(); + var col = db.GetCollection("Jump"); + + result = col.FindAll().ToList(); } return result; @@ -28,12 +29,11 @@ namespace skydiveLogs_api.Data { Jump result; - using (StreamReader file = File.OpenText(@"Data/Jump.json")) - using (JsonTextReader reader = new JsonTextReader(file)) + using (var db = new LiteDatabase(@".\Data\MyData.db")) { - var jsonResult = (JArray)JToken.ReadFrom(reader); - var tmp = jsonResult.ToObject>(); - result = tmp.SingleOrDefault(t => t.Id == id); + var col = db.GetCollection("Jump"); + + result = col.FindById(new BsonValue(id)); } return result; @@ -42,22 +42,15 @@ namespace skydiveLogs_api.Data public bool AddJump(Jump newJump) { var result = true; - List jumpList; try { - using (StreamReader file = File.OpenText(@"Data/Jump.json")) - using (JsonTextReader reader = new JsonTextReader(file)) + using (var db = new LiteDatabase(@".\Data\MyData.db")) { - var jsonResult = (JArray)JToken.ReadFrom(reader); - jumpList = jsonResult.ToObject>(); + var col = db.GetCollection("Jump"); + + col.Insert(newJump); } - - newJump.Id = jumpList.Count() + 1; - jumpList.Add(newJump); - - string outputJson = JsonConvert.SerializeObject(jumpList); - File.WriteAllText(@"Data/Jump.json", outputJson); } catch { diff --git a/Back/skydiveLogs-api.Data/JumpTypeRepository.cs b/Back/skydiveLogs-api.Data/JumpTypeRepository.cs index 0839f9c..1bab9d7 100644 --- a/Back/skydiveLogs-api.Data/JumpTypeRepository.cs +++ b/Back/skydiveLogs-api.Data/JumpTypeRepository.cs @@ -1,12 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; +using System.Linq; + +using LiteDB; + using skydiveLogs_api.Data.Interface; using skydiveLogs_api.Model; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using System.IO; -using System.Linq; + namespace skydiveLogs_api.Data { @@ -16,11 +15,11 @@ namespace skydiveLogs_api.Data { IEnumerable result = new List(); - using (StreamReader file = File.OpenText(@"Data/JumpType.json")) - using (JsonTextReader reader = new JsonTextReader(file)) + using (var db = new LiteDatabase(@".\Data\MyData.db")) { - var jsonResult = (JArray)JToken.ReadFrom(reader); - result = jsonResult.ToObject>(); + var col = db.GetCollection("JumpType"); + + result = col.FindAll().ToList(); } return result; @@ -30,12 +29,11 @@ namespace skydiveLogs_api.Data { JumpType result; - using (StreamReader file = File.OpenText(@"Data/JumpType.json")) - using (JsonTextReader reader = new JsonTextReader(file)) + using (var db = new LiteDatabase(@".\Data\MyData.db")) { - var jsonResult = (JArray)JToken.ReadFrom(reader); - var tmp = jsonResult.ToObject>(); - result = tmp.SingleOrDefault(t => t.Id == id); + var col = db.GetCollection("JumpType"); + + result = col.FindById(new BsonValue(id)); } return result; diff --git a/Back/skydiveLogs-api.Data/skydiveLogs-api.Data.csproj b/Back/skydiveLogs-api.Data/skydiveLogs-api.Data.csproj index baa6ed0..2b41fe9 100644 --- a/Back/skydiveLogs-api.Data/skydiveLogs-api.Data.csproj +++ b/Back/skydiveLogs-api.Data/skydiveLogs-api.Data.csproj @@ -5,32 +5,6 @@ skydiveLogs_api.Data - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - diff --git a/Back/skydiveLogs-api/Data/MyData.db b/Back/skydiveLogs-api/Data/MyData.db index ee238d1..4e857b2 100644 Binary files a/Back/skydiveLogs-api/Data/MyData.db and b/Back/skydiveLogs-api/Data/MyData.db differ