=Mobile app Core update

packages/common/src/interfaces/ICategory.ts

@@ -0,0 +1,10 @@
+// TODO: add other locales
+
+/*
+type ICategory = 'cake' | 'food' | 'mart' | 'pizza' | 'clean' | 'med' | 'me2u' | 'messenger';
+
+export default ICategory;
+*/
+export default interface ICategory {
+  name: string;
+}

packages/core/src/graphql/geo-locations/geo-location.resolver.ts

@@ -52,6 +52,33 @@ export class GeoLocationResolver {
 			searchText
 		);
 	}
+
+	@Query()
+	async geoLocationProductsByCategory(
+		_,
+		{
+			geoLocation,
+			options,
+			category,
+			pagingOptions = {},
+			searchText
+		}: {
+			geoLocation;
+			options?: IGetGeoLocationProductsOptions;
+			category?;
+			pagingOptions;
+			searchText?: string;
+		}
+	) {
+		return this.geoLocationsProductsService.geoLocationProductsByCategory(
+			geoLocation,
+			category,
+			pagingOptions,
+			options,
+			searchText
+		);
+	}
+
 	@Query()
 	async getCountOfGeoLocationProducts(
 		_,

packages/core/src/graphql/geo-locations/geo-locations.graphql

@@ -77,6 +77,14 @@ type Query {
 		searchText: String
 	): [ProductInfo]!
 
+	geoLocationProductsByCategory(
+		geoLocation: GeoLocationFindInput!
+		category: ProductsCategorySearchInput
+		pagingOptions: PagingOptionsInput
+		options: GetGeoLocationProductsOptions
+		searchText: String
+	): [ProductInfo]!
+
 	getCountOfGeoLocationProducts(
 		geoLocation: GeoLocationFindInput!
 		options: GetGeoLocationProductsOptions

packages/core/src/graphql/geo-locations/merchants/geo-location-merchants.graphql

@@ -1,3 +1,4 @@
 type Query {
 	getCoseMerchants(geoLocation: GeoLocationFindInput!): [Warehouse]!
+	getCloseMerchantsCategory(geoLocation: GeoLocationFindInput!, category: ProductsCategorySearchInput): [Warehouse]!
 }

packages/core/src/graphql/geo-locations/merchants/geo-location-merchants.resolver.ts

@@ -4,6 +4,7 @@ import IGeoLocation from '@modules/server.common/interfaces/IGeoLocation';
 import Warehouse from '@modules/server.common/entities/Warehouse';
 import Utils from '@modules/server.common/utils';
 import GeoLocation from '@modules/server.common/entities/GeoLocation';
+import ICategory from '@modules/server.common/interfaces/ICategory';
 
 const IN_STORE_DISTANCE = 50;
 
@@ -35,4 +36,29 @@ export class GeoLocationMerchantsResolver {
 
 		return merchants.map((m) => new Warehouse(m));
 	}
+
+	@Query('getCloseMerchantsCategory')
+async getCloseMerchantsCategory(_, { geoLocation }: { geoLocation: IGeoLocation }, {category}: {category: ICategory} ) {
+	let merchants = await this.geoLocationsWarehousesService.getCloseMerchantsCategory(
+		geoLocation,
+		category,
+		IN_STORE_DISTANCE,
+		{ fullProducts: false, activeOnly: true }
+	);
+
+	merchants = merchants.sort(
+		(m1, m2) =>
+			Utils.getDistance(
+				new GeoLocation(m1.geoLocation),
+				new GeoLocation(geoLocation)
+			) -
+			Utils.getDistance(
+				new GeoLocation(m2.geoLocation),
+				new GeoLocation(geoLocation)
+			)
+	);
+
+	return merchants.map((m) => new Warehouse(m));
+}
+
 }

packages/core/src/graphql/products/categories/products-categories.types.graphql

@@ -7,6 +7,10 @@ type ProductsCategory {
 	_updatedAt: Date
 }
 
+input ProductsCategorySearchInput {
+	name: String!
+}
+
 input ProductsCategoryInput {
 	_id: String!
 	name: [TranslateInput!]

packages/core/src/services/geo-locations/GeoLocationsProductsService.ts

@@ -26,6 +26,7 @@ import {
 } from '@modules/server.common/interfaces/IProduct';
 import WarehouseProduct from '@modules/server.common/entities/WarehouseProduct';
 import { IGetGeoLocationProductsOptions } from 'graphql/geo-locations/geo-location.resolver';
+import ICategory from '@modules/server.common/interfaces/ICategory';
 
 @injectable()
 @routerName('geo-location-products')
@@ -132,6 +133,35 @@ export class GeoLocationsProductsService
 		return products.slice(pagingOptions.skip).slice(0, pagingOptions.limit);
 	}
 
+	@asyncListener()
+	async geoLocationProductsByCategory(
+		@serialization((g: IGeoLocation) => new GeoLocation(g))
+		geoLocation: GeoLocation,
+		category: ICategory,
+		pagingOptions,
+		options?: IGetGeoLocationProductsOptions,
+		searchText?: string
+	): Promise<ProductInfo[]> {
+		const merchants = await this.geoLocationsWarehousesService.getMerchants(
+			geoLocation,
+			GeoLocationsWarehousesService.TrackingDistance,
+			{
+				fullProducts: true,
+				activeOnly: true,
+				merchantsIds: options ? options.merchantIds : null
+			}
+		);
+
+		const products = this._getProductsFromWarehouses(
+			geoLocation,
+			merchants.map((m) => new Warehouse(m)),
+			options,
+			searchText
+		);
+
+		return products.slice(pagingOptions.skip).slice(0, pagingOptions.limit);
+	}
+
 	private _getProductsFromWarehouses(
 		geoLocation: GeoLocation,
 		warehouses: Warehouse[],

packages/core/src/services/geo-locations/GeoLocationsWarehousesService.ts

@@ -15,6 +15,7 @@ import {
 	asyncListener,
 } from '@pyro/io';
 import IGeoLocation from '@modules/server.common/interfaces/IGeoLocation';
+import ICategory from '@modules/server.common/interfaces/ICategory';
 import IGeoLocationWarehousesRouter from '@modules/server.common/routers/IGeoLocationWarehousesRouter';
 import IService from '../IService';
 import { ExistenceEventType } from '@pyro/db-server';
@@ -175,6 +176,46 @@ export class GeoLocationsWarehousesService
 		return merchants;
 	}
 
+	@asyncListener()
+	async getCloseMerchantsCategory(
+		geoLocation: IGeoLocation,
+		category: ICategory,
+		maxDistance: number,
+		options: {
+			fullProducts: boolean;
+			activeOnly: boolean;
+			merchantsIds?: string[];
+		}
+	): Promise<IWarehouse[]> {
+		const merchantsIds = options.merchantsIds;
+		const merchants = (await this.warehousesService.Model.find(
+			_.assign(
+				{
+					'geoLocation.loc': {
+						$near: {
+							$geometry: {
+								type: 'Point',
+								coordinates: geoLocation.loc.coordinates
+							},
+							$maxDistance: maxDistance
+						}
+					}
+				},
+				options.activeOnly ? { isActive: true } : {},
+				merchantsIds && merchantsIds.length > 0
+					? {
+							_id: { $in: merchantsIds }
+					  }
+					: {}
+			)
+		)
+			.populate(options.fullProducts ? 'products.product' : '')
+			.lean()
+			.exec()) as IWarehouse[];
+
+		return merchants;
+	}
+
 	/**
 	 * Get warehouses available for given location
 	 *

packages/core/src/services/invites/InvitesRequestsService.ts

@@ -289,11 +289,11 @@ export class InvitesRequestsService extends DBService<InviteRequest>
 						},
 					},
 				};
-			case 'ru-RU':
+			case 'fr-FR':
 				return {
 					android: {
-						title: 'Ever только что запустился!',
-						alert: 'Кликните чтобы увидить доступные продукты.',
+						title: 'BellEm, c est lance!',
+						alert: 'Cliquez pour voir les produits disponibles.',
 						extra: {
 							event: launched,
 							invite: JSON.stringify(invite),