Slugy, webp, hromada refaktoringu

src/graphql/fragments/aircraft.js

@@ -60,13 +60,8 @@ fragment aircraftFullPrivateInfo on Aircraft {
           name
       }
     }
-
-    flights {
-      ...flightListInfo
-    }
 }
 
 ${FRAGMENT_AIRCRAFT_FULL_INFO}
 ${FRAGMENT_PHOTO_FULL_INFO}
-${FRAGMENT_FLIGHT_LIST_INFO}
 `;

src/graphql/fragments/copilot.js

@@ -15,6 +15,8 @@ export const FRAGMENT_COPILOT_FULL_INFO = gql`
 fragment copilotFullInfo on Copilot {
   id
   name
+  isPublic
+  urlSlug
 
   titlePhoto {
     id
@@ -25,13 +27,7 @@ fragment copilotFullInfo on Copilot {
 
 export const FRAGMENT_COPILOT_FULL_PRIVATE_INFO = gql`
 fragment copilotFullPrivateInfo on Copilot {
-  id
-  name
-
-  titlePhoto {
-    id
-    url
-  }
+  ...copilotFullInfo
 
    photos {
       ...photoFullInfo
@@ -49,4 +45,5 @@ fragment copilotFullPrivateInfo on Copilot {
 }
 
 ${FRAGMENT_PHOTO_FULL_INFO}
+${FRAGMENT_COPILOT_FULL_INFO}
 `;

src/graphql/fragments/event.js

@@ -6,6 +6,7 @@ fragment eventListInfo on Event {
   name
   description
   isPublic
+  urlSlug
 }
 `;
 
@@ -15,6 +16,7 @@ fragment eventFullInfo on Event {
   name
   description
   isPublic
+  urlSlug
   dateFrom
   dateTo
 }

src/graphql/fragments/flight.js

@@ -21,6 +21,7 @@ export const FRAGMENT_FLIGHT_FULL_INFO = gql`
 fragment flightFullInfo on Flight {
   id
   name
+  urlSlug
   description
   takeoffDatetime
   landingDatetime
@@ -53,6 +54,8 @@ fragment flightFullInfo on Flight {
   copilots {
     id
     name
+    isPublic
+    urlSlug
   }
 
   event {

src/graphql/fragments/flight_list.js

@@ -6,6 +6,7 @@ export const FRAGMENT_FLIGHT_LIST_INFO = gql`
 fragment flightListInfo on Flight {
   id
   name
+  urlSlug
   takeoffDatetime
   landingDatetime
   durationMinCalculated

src/graphql/fragments/photo.js

@@ -12,7 +12,6 @@ export const FRAGMENT_PHOTO_FULL_INFO = gql`
     aircraftId
     width
     height
-    isFlightCover
     gpsLatitude
     gpsLongitude
     gpsAltitude

src/graphql/fragments/poi.js

@@ -6,6 +6,7 @@ export const FRAGMENT_POI_LIST_INFO = gql`
 fragment pointOfInterestListInfo on PointOfInterest {
   id
   name
+  urlSlug
   isPublic
   titlePhoto {
     thumbnailUrl
@@ -21,6 +22,7 @@ export const FRAGMENT_POI_FULL_INFO = gql`
 fragment pointOfInterestFullInfo on PointOfInterest {
   id
   name
+  urlSlug
   description
   isPublic
   gpsLatitude

src/graphql/queries/aircrafts.js

@@ -25,8 +25,8 @@ ${FRAGMENT_AIRCRAFT_FULL_PRIVATE_INFO}
 `;
 
 export const AIRCRAFT_PUBLIC_DETAIL = gql`
-query AircraftDetail($id: Int!) {
-  aircraft(id: $id, public: true) {
+query AircraftDetail($callSign: String!) {
+  aircraft(callSign: $callSign, public: true) {
     ...aircraftFullInfo
   }
 }

src/graphql/queries/copilots.js

@@ -34,8 +34,8 @@ ${FRAGMENT_FLIGHT_LIST_INFO}
 `;
 
 export const COPILOT_PUBLIC_DETAIL = gql`
-query copilot($id: Int!, $pilotUsername: String) {
-  copilot(id: $id, pilotUsername: $pilotUsername) {
+query copilot($urlSlug: String!, $pilotUsername: String) {
+  copilot(urlSlug: $urlSlug, pilotUsername: $pilotUsername, public: true) {
     ...copilotFullInfo
   }
 }

src/graphql/queries/event.js

@@ -55,8 +55,8 @@ ${FRAGMENT_EVENT_FULL_INFO}
 `;
 
 export const EVENT_PUBLIC_DETAIL = gql`
-query eventPublicDetail($id: Int!, $username: String) {
-  event(id: $id, username: $username, public: true) {
+query eventPublicDetail($urlSlug: String!, $username: String!) {
+  event(urlSlug: $urlSlug, username: $username, public: true) {
     ...eventFullInfo
 
    flights {

src/graphql/queries/flights.js

@@ -4,8 +4,15 @@ import {FRAGMENT_FLIGHT_LIST_INFO} from "src/graphql/fragments/flight_list";
 import {FRAGMENT_PHOTO_FULL_INFO} from "src/graphql/fragments/photo";
 
 export const FLIGHTS_LIST = gql`
-query FlightsList($limit: Int!, $offset: Int) {
-  flights(limit: $limit, offset: $offset) {
+query FlightsList($eventId: Int, $aircraftId: Int, $copilotId: Int, $pointOfInterestId: Int, $limit: Int!, $offset: Int) {
+  flights(
+    eventId: $eventId,
+    aircraftId: $aircraftId,
+    copilotId: $copilotId,
+    pointOfInterestId: $pointOfInterestId,
+    limit: $limit,
+    offset: $offset
+  ) {
    totalItemsCount
     items {
       ...flightListInfo
@@ -51,8 +58,8 @@ ${FRAGMENT_FLIGHT_FULL_PRIVATE_INFO}
 `;
 
 export const FLIGHT_PUBLIC_DETAIL = gql`
-query FlightPublicDetail($id: Int!, $username: String) {
-  flight(id: $id, username: $username, public: true) {
+query FlightPublicDetail($urlSlug: String!, $username: String) {
+  flight(urlSlug: $urlSlug, username: $username, public: true) {
     ...flightFullInfo
   }
 }

src/graphql/queries/poi.js

@@ -38,8 +38,8 @@ ${FRAGMENT_POI_FULL_PRIVATE_INFO}
 `;
 
 export const POI_PUBLIC_DETAIL = gql`
-query publicPOIDetail($id: Int!) {
-  pointOfInterest(id: $id, public: true) {
+query publicPOIDetail($urlSlug: String!) {
+  pointOfInterest(urlSlug: $urlSlug, public: true) {
     ...pointOfInterestFullInfo
   }
 }