chore(release): [ci skip] bump quickstart image to sha256@fc8e7120fb2…

…4a527ad91f5301ae7f62b1d8fe3ad3988e70eebb9854e8b6d007e

quickstart/dev/config/apollo-federation/supergraph.graphql

@@ -1035,6 +1035,40 @@ type MapMarker
 scalar Memo
   @join__type(graph: PUBLIC)
 
+type Merchant
+  @join__type(graph: PUBLIC)
+{
+  """
+  GPS coordinates for the merchant that can be used to place the related business on a map
+  """
+  coordinates: Coordinates!
+  createdAt: Timestamp!
+  id: ID!
+  title: String!
+
+  """The username of the merchant"""
+  username: Username!
+
+  """Whether the merchant has been validated"""
+  validated: Boolean!
+}
+
+input MerchantMapSuggestInput
+  @join__type(graph: PUBLIC)
+{
+  latitude: Float!
+  longitude: Float!
+  title: String!
+  username: Username!
+}
+
+type MerchantPayload
+  @join__type(graph: PUBLIC)
+{
+  errors: [Error!]!
+  merchant: Merchant
+}
+
 """(Positive) amount of minutes"""
 scalar Minutes
   @join__type(graph: PUBLIC)
@@ -1168,6 +1202,7 @@ type Mutation
 
   """Sends a payment to a lightning address."""
   lnurlPaymentSend(input: LnurlPaymentSendInput!): PaymentSendPayload! @join__field(graph: PUBLIC)
+  merchantMapSuggest(input: MerchantMapSuggestInput!): MerchantPayload! @join__field(graph: PUBLIC)
   onChainAddressCreate(input: OnChainAddressCreateInput!): OnChainAddressPayload! @join__field(graph: PUBLIC)
   onChainAddressCurrent(input: OnChainAddressCurrentInput!): OnChainAddressPayload! @join__field(graph: PUBLIC)
   onChainPaymentSend(input: OnChainPaymentSendInput!): PaymentSendPayload! @join__field(graph: PUBLIC)

quickstart/docker-compose.tmpl.yml

@@ -1,8 +1,8 @@
 #@ load("@ytt:data", "data")
 
-#@ galoy_api_image_digest = "sha256@c707ddebb0e6e8e79bd1c7dd58b7483064c77609e9eb30fd0a5c59f1d6206af3"
-#@ galoy_trigger_image_digest = "sha256@8c6224c7478ec509bdda00ec61cdcd68c964bffd6c8aebfbbc66ea396579f6a3"
-#@ mongodb_migrate_image_digest = "sha256@a0862f9b08eebab72e17fadf8ad9b7292b984428e982eb8fea21a81edadcefd1"
+#@ galoy_api_image_digest = "sha256@fc8e7120fb24a527ad91f5301ae7f62b1d8fe3ad3988e70eebb9854e8b6d007e"
+#@ galoy_trigger_image_digest = "sha256@88ae4226e2a3ce0a0bac487705e4ee540e32a26f6e0d5097af1f78842c705102"
+#@ mongodb_migrate_image_digest = "sha256@c226d7ed9302c7fefae0edcd1b488c067250dfb59b40c956ac0e2f1ce85547b0"
 #@ galoy_notifications_image_digest = "sha256@a580eceec5260d6c06221b03f5e1e45c7545b6eb380961c9285206011d1b96bd"
 
 #@ core_env = [

quickstart/docker-compose.yml

@@ -98,7 +98,7 @@ services:
     - POSTGRES_PASSWORD=secret
     - POSTGRES_DB=hydra
   galoy:
-    image: us.gcr.io/galoy-org/galoy-api@sha256:c707ddebb0e6e8e79bd1c7dd58b7483064c77609e9eb30fd0a5c59f1d6206af3
+    image: us.gcr.io/galoy-org/galoy-api@sha256:fc8e7120fb24a527ad91f5301ae7f62b1d8fe3ad3988e70eebb9854e8b6d007e
     environment:
     - HELMREVISION=dev
     - NETWORK=regtest
@@ -161,7 +161,7 @@ services:
         aliases:
         - bats-tests
   trigger:
-    image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:8c6224c7478ec509bdda00ec61cdcd68c964bffd6c8aebfbbc66ea396579f6a3
+    image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:88ae4226e2a3ce0a0bac487705e4ee540e32a26f6e0d5097af1f78842c705102
     environment:
     - HELMREVISION=dev
     - NETWORK=regtest
@@ -248,7 +248,7 @@ services:
     environment:
     - MONGO_INITDB_DATABASE=galoy
   mongodb-migrate:
-    image: us.gcr.io/galoy-org/galoy-api-migrate@sha256:a0862f9b08eebab72e17fadf8ad9b7292b984428e982eb8fea21a81edadcefd1
+    image: us.gcr.io/galoy-org/galoy-api-migrate@sha256:c226d7ed9302c7fefae0edcd1b488c067250dfb59b40c956ac0e2f1ce85547b0
     depends_on:
     - mongodb
     environment:

quickstart/graphql/gql/merchant-map-suggest.gql

@@ -0,0 +1,17 @@
+mutation merchantMapSuggest($input: MerchantMapSuggestInput!) {
+  merchantMapSuggest(input: $input) {
+    errors {
+      message
+    }
+    merchant {
+      id
+      validated
+      title
+      coordinates {
+        latitude
+        longitude
+      }
+      username
+    }
+  }
+}

quickstart/graphql/schemas/admin/schema.graphql

@@ -51,28 +51,13 @@ type AuditedAccount {
   createdAt: Timestamp!
   id: ID!
   level: AccountLevel!
+  merchants: [Merchant!]!
   owner: AuditedUser!
   status: AccountStatus!
   username: Username
   wallets: [Wallet!]!
 }
 
-type AuditedMerchant {
-  """
-  GPS coordinates for the merchant that can be used to place the related business on a map
-  """
-  coordinates: Coordinates
-  createdAt: Timestamp!
-  id: ID!
-  title: String!
-
-  """The username of the merchant"""
-  username: Username!
-
-  """Whether the merchant has been validated"""
-  validated: Boolean!
-}
-
 type AuditedUser {
   createdAt: Timestamp!
 
@@ -152,17 +137,6 @@ type BTCWallet implements Wallet {
   walletCurrency: WalletCurrency!
 }
 
-input BusinessDeleteMapInfoInput {
-  username: Username!
-}
-
-input BusinessUpdateMapInfoInput {
-  latitude: Float!
-  longitude: Float!
-  title: String!
-  username: Username!
-}
-
 type Coordinates {
   latitude: Float!
   longitude: Float!
@@ -294,17 +268,41 @@ scalar LnPubkey
 """Text field in a lightning payment transaction"""
 scalar Memo
 
+type Merchant {
+  """
+  GPS coordinates for the merchant that can be used to place the related business on a map
+  """
+  coordinates: Coordinates!
+  createdAt: Timestamp!
+  id: ID!
+  title: String!
+
+  """The username of the merchant"""
+  username: Username!
+
+  """Whether the merchant has been validated"""
+  validated: Boolean!
+}
+
+input MerchantMapDeleteInput {
+  id: ID!
+}
+
+input MerchantMapValidateInput {
+  id: ID!
+}
+
 type MerchantPayload {
   errors: [Error!]!
-  merchant: AuditedMerchant
+  merchant: Merchant
 }
 
 type Mutation {
   accountUpdateLevel(input: AccountUpdateLevelInput!): AccountDetailPayload!
   accountUpdateStatus(input: AccountUpdateStatusInput!): AccountDetailPayload!
   adminPushNotificationSend(input: AdminPushNotificationSendInput!): AdminPushNotificationSendPayload!
-  businessDeleteMapInfo(input: BusinessDeleteMapInfoInput!): AccountDetailPayload!
-  businessUpdateMapInfo(input: BusinessUpdateMapInfoInput!): MerchantPayload!
+  merchantMapDelete(input: MerchantMapDeleteInput!): MerchantPayload!
+  merchantMapValidate(input: MerchantMapValidateInput!): MerchantPayload!
   userUpdatePhone(input: UserUpdatePhoneInput!): AccountDetailPayload!
 }
 
@@ -363,6 +361,7 @@ type Query {
   lightningInvoice(hash: PaymentHash!): LightningInvoice!
   lightningPayment(hash: PaymentHash!): LightningPayment!
   listWalletIds(walletCurrency: WalletCurrency!): [WalletId!]!
+  merchantsPendingApproval: [Merchant!]!
   transactionById(id: ID!): Transaction
   transactionsByHash(hash: PaymentHash!): [Transaction]
   wallet(walletId: WalletId!): Wallet!

quickstart/graphql/schemas/public/schema.graphql

@@ -778,6 +778,34 @@ type MapMarker {
 """Text field in a lightning payment transaction"""
 scalar Memo
 
+type Merchant {
+  """
+  GPS coordinates for the merchant that can be used to place the related business on a map
+  """
+  coordinates: Coordinates!
+  createdAt: Timestamp!
+  id: ID!
+  title: String!
+
+  """The username of the merchant"""
+  username: Username!
+
+  """Whether the merchant has been validated"""
+  validated: Boolean!
+}
+
+input MerchantMapSuggestInput {
+  latitude: Float!
+  longitude: Float!
+  title: String!
+  username: Username!
+}
+
+type MerchantPayload {
+  errors: [Error!]!
+  merchant: Merchant
+}
+
 """(Positive) amount of minutes"""
 scalar Minutes
 
@@ -898,6 +926,7 @@ type Mutation {
 
   """Sends a payment to a lightning address."""
   lnurlPaymentSend(input: LnurlPaymentSendInput!): PaymentSendPayload!
+  merchantMapSuggest(input: MerchantMapSuggestInput!): MerchantPayload!
   onChainAddressCreate(input: OnChainAddressCreateInput!): OnChainAddressPayload!
   onChainAddressCurrent(input: OnChainAddressCurrentInput!): OnChainAddressPayload!
   onChainPaymentSend(input: OnChainPaymentSendInput!): PaymentSendPayload!

quickstart/vendir.lock.yml

@@ -2,24 +2,24 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - git:
-      commitTitle: 'fix: migration for location (#3935)...'
-      sha: 500123ea65d0e1eb24c7cf64ab00a16af09a1528
+      commitTitle: 'feat: adding suggest and approve endpoint for the map (#3937)'
+      sha: d2f6f35ab4fb67397094684d4b7fc0cf79d47111
       tags:
-      - 0.20.40-2-g500123ea6
+      - 0.20.41-2-gd2f6f35ab
     path: ./
   path: dev
 - contents:
   - git:
-      commitTitle: 'fix: migration for location (#3935)...'
-      sha: 500123ea65d0e1eb24c7cf64ab00a16af09a1528
+      commitTitle: 'feat: adding suggest and approve endpoint for the map (#3937)'
+      sha: d2f6f35ab4fb67397094684d4b7fc0cf79d47111
       tags:
-      - 0.20.40-2-g500123ea6
+      - 0.20.41-2-gd2f6f35ab
     path: schemas/
   - git:
-      commitTitle: 'fix: migration for location (#3935)...'
-      sha: 500123ea65d0e1eb24c7cf64ab00a16af09a1528
+      commitTitle: 'feat: adding suggest and approve endpoint for the map (#3937)'
+      sha: d2f6f35ab4fb67397094684d4b7fc0cf79d47111
       tags:
-      - 0.20.40-2-g500123ea6
+      - 0.20.41-2-gd2f6f35ab
     path: gql/
   path: ./graphql
 kind: LockConfig

quickstart/vendir.yml

@@ -6,7 +6,7 @@ directories:
   - path: ./
     git:
       url: https://github.com/GaloyMoney/galoy.git
-      ref: 500123ea65d0e1eb24c7cf64ab00a16af09a1528
+      ref: d2f6f35ab4fb67397094684d4b7fc0cf79d47111
     includePaths:
     - dev/**/*
     excludePaths:
@@ -18,15 +18,15 @@ directories:
   - path: schemas/
     git:
       url: https://github.com/GaloyMoney/galoy.git
-      ref: 500123ea65d0e1eb24c7cf64ab00a16af09a1528
+      ref: d2f6f35ab4fb67397094684d4b7fc0cf79d47111
     includePaths:
     - core/api/src/graphql/public/schema.graphql
     - core/api/src/graphql/admin/schema.graphql
     newRootPath: core/api/src/graphql
   - path: gql/
     git:
       url: https://github.com/GaloyMoney/galoy.git
-      ref: 500123ea65d0e1eb24c7cf64ab00a16af09a1528
+      ref: d2f6f35ab4fb67397094684d4b7fc0cf79d47111
     includePaths:
     - bats/gql/**/*
     newRootPath: bats/gql

quickstart/vendir/values.yml

@@ -1,3 +1,3 @@
 #@data/values
 ---
-galoy_git_ref: 500123ea65d0e1eb24c7cf64ab00a16af09a1528
+galoy_git_ref: d2f6f35ab4fb67397094684d4b7fc0cf79d47111