Companies query with order by coordinates

https://freecode.academy/tasks/ckm05poxrdt710730omgy2svq
gorodskie-bani-ru · Mar 12, 2021 · fc743d6 · fc743d6
1 parent 6d884d2
commit fc743d6
Show file tree

Hide file tree

Showing 11 changed files with 486 additions and 249 deletions.
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
@@ -63,7 +63,6 @@ addDecorator(makeDecorator({
           events: {} as MittEmitter,
           isReady: true,
           isLocaleDomain: false,
-          isPreview: false,
         }}
       >
         {storyFn(context)}

diff --git a/server/nexus/constants.ts b/server/nexus/constants.ts
@@ -2,7 +2,7 @@
  * ID ТВшек
  */
 export const TemplateVarIDs = {
-  coors: 27,
+  coords: 27,
   image: 3,
   gallery: 23,
   address: 14,

diff --git a/server/nexus/generated/nexus.ts b/server/nexus/generated/nexus.ts
@@ -70,6 +70,15 @@ export interface NexusGenInputs {
     equals?: boolean | null // Boolean
     not?: NexusGenInputs['NestedBoolFilter'] | null // NestedBoolFilter
   }
+  CompaniesOrderByCoordsInput: {
+    // input type
+    lat: number // Float!
+    lng: number // Float!
+  }
+  CompaniesOrderByInput: {
+    // input type
+    coords?: NexusGenInputs['CompaniesOrderByCoordsInput'] | null // CompaniesOrderByCoordsInput
+  }
   DateTimeFilter: {
     // input type
     equals?: NexusGenScalars['DateTime'] | null // DateTime
@@ -1313,11 +1322,9 @@ export interface NexusGenArgTypes {
     }
     companies: {
       // args
-      cursor?: NexusGenInputs['bani684_site_contentWhereUniqueInput'] | null // bani684_site_contentWhereUniqueInput
-      orderBy?: NexusGenInputs['bani684_site_contentOrderByInput'][] | null // [bani684_site_contentOrderByInput!]
+      orderBy?: NexusGenInputs['CompaniesOrderByInput'] | null // CompaniesOrderByInput
       skip?: number | null // Int
       take?: number | null // Int
-      where?: NexusGenInputs['bani684_site_contentWhereInput'] | null // bani684_site_contentWhereInput
     }
     ratings: {
       // args

diff --git a/server/nexus/generated/schema.graphql b/server/nexus/generated/schema.graphql
@@ -81,6 +81,18 @@ type Comment {
   text: String
 }
 
+"""
+Сортировка по удаленности от координаты
+"""
+input CompaniesOrderByCoordsInput {
+  lat: Float!
+  lng: Float!
+}
+
+input CompaniesOrderByInput {
+  coords: CompaniesOrderByCoordsInput
+}
+
 """
 Компания
 """
@@ -332,13 +344,7 @@ type Query {
   """
   Компании
   """
-  companies(
-    cursor: bani684_site_contentWhereUniqueInput
-    orderBy: [bani684_site_contentOrderByInput!]
-    skip: Int
-    take: Int
-    where: bani684_site_contentWhereInput
-  ): [Company!]!
+  companies(orderBy: CompaniesOrderByInput, skip: Int, take: Int): [Company!]!
 
   """
   Рейтинги заведений