Merge pull request #5 from lemagnifick/beta01-arthur

Beta01 arthur
lemagnifick · Jul 30, 2020 · b11140b · b11140b
2 parents 95c1824 + cf8e333
commit b11140b
Show file tree

Hide file tree

Showing 30 changed files with 1,656 additions and 114 deletions.
diff --git a/packages/common/src/entities/Order.ts b/packages/common/src/entities/Order.ts
@@ -403,7 +403,6 @@ class Order extends DBObject<IOrder, IOrderCreateObject> implements IOrder {
 				return 'MAUVAIS_STATUS';
 		}
 	}
-
 }
 
 export default Order;
diff --git a/packages/core/src/graphql/geo-locations/geo-location.resolver.ts b/packages/core/src/graphql/geo-locations/geo-location.resolver.ts
@@ -65,7 +65,7 @@ export class GeoLocationResolver {
 		}: {
 			geoLocation;
 			options?: IGetGeoLocationProductsOptions;
-			category?;
+			category?: string;
 			pagingOptions;
 			searchText?: string;
 		}

diff --git a/packages/core/src/graphql/geo-locations/geo-locations.graphql b/packages/core/src/graphql/geo-locations/geo-locations.graphql
@@ -79,7 +79,7 @@ type Query {
 
 	geoLocationProductsByCategory(
 		geoLocation: GeoLocationFindInput!
-		category: ProductsCategorySearchInput
+		category: String
 		pagingOptions: PagingOptionsInput
 		options: GetGeoLocationProductsOptions
 		searchText: String

diff --git a/packages/core/src/graphql/geo-locations/merchants/geo-location-merchants.graphql b/packages/core/src/graphql/geo-locations/merchants/geo-location-merchants.graphql
@@ -1,7 +1,20 @@
 type Query {
 	getCoseMerchants(geoLocation: GeoLocationFindInput!): [Warehouse]!
+
 	getCloseMerchantsCategory(
 		geoLocation: GeoLocationFindInput!
-		category: ProductsCategorySearchInput
+		category: String
+	): [Warehouse]!
+}
+
+type Query {
+	getCloseMerchantsCategory(
+		geoLocation: GeoLocationFindInput!
+		category: String
+	): [Warehouse]!
+
+	getCloseMerchantsCategory(
+		geoLocation: GeoLocationFindInput!
+		category: String
 	): [Warehouse]!
 }
diff --git a/packages/core/src/graphql/geo-locations/merchants/geo-location-merchants.resolver.ts b/packages/core/src/graphql/geo-locations/merchants/geo-location-merchants.resolver.ts
@@ -41,7 +41,7 @@ export class GeoLocationMerchantsResolver {
 	async getCloseMerchantsCategory(
 		_,
 		{ geoLocation }: { geoLocation: IGeoLocation },
-		{ category }: { category: ICategory }
+		{ category }: { category: string }
 	) {
 		let merchants = await this.geoLocationsWarehousesService.getCloseMerchantsCategory(
 			geoLocation,

diff --git a/packages/core/src/graphql/warehouses/warehouse.resolver.ts b/packages/core/src/graphql/warehouses/warehouse.resolver.ts
@@ -241,6 +241,42 @@ export class WarehouseResolver {
 		return merchants.map((m) => new Warehouse(m));
 	}
 
+	@Query()
+	async getMerchantsByService(
+		_,
+		{
+			searchName,
+			geoLocation,
+		}: { searchName: string; geoLocation: IGeoLocation }
+	) {
+		const count = await this._warehousesService.Model.find({
+			ordersPhone: { $regex: searchName, $options: 'i' },
+		})
+			.countDocuments()
+			.exec();
+
+		let merchants = await this._warehousesService.getMerchants(
+			{ ordersPhone: { $regex: searchName, $options: 'i' } },
+			{ skip: 0, limit: count }
+		);
+
+		if (geoLocation) {
+			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));
+	}
+
 	@Mutation()
 	async warehouseLogin(
 		_,

diff --git a/packages/core/src/graphql/warehouses/warehouses.types.graphql b/packages/core/src/graphql/warehouses/warehouses.types.graphql
@@ -155,6 +155,11 @@ type Query {
 		searchName: String!
 		geoLocation: GeoLocationFindInput
 	): [Warehouse]!
+
+	getMerchantsByService(
+		searchName: String!
+		geoLocation: GeoLocationFindInput
+	): [Warehouse]!
 }
 
 type ExistingCustomersByStores {

diff --git a/packages/core/src/services/geo-locations/GeoLocationsProductsService.ts b/packages/core/src/services/geo-locations/GeoLocationsProductsService.ts
@@ -26,7 +26,6 @@ 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')
@@ -137,7 +136,7 @@ export class GeoLocationsProductsService
 	async geoLocationProductsByCategory(
 		@serialization((g: IGeoLocation) => new GeoLocation(g))
 		geoLocation: GeoLocation,
-		category: ICategory,
+		category: string,
 		pagingOptions,
 		options?: IGetGeoLocationProductsOptions,
 		searchText?: string

diff --git a/packages/core/src/services/geo-locations/GeoLocationsWarehousesService.ts b/packages/core/src/services/geo-locations/GeoLocationsWarehousesService.ts
@@ -179,7 +179,7 @@ export class GeoLocationsWarehousesService
 	@asyncListener()
 	async getCloseMerchantsCategory(
 		geoLocation: IGeoLocation,
-		category: ICategory,
+		category: string,
 		maxDistance: number,
 		options: {
 			fullProducts: boolean;
@@ -201,6 +201,11 @@ export class GeoLocationsWarehousesService
 						},
 					},
 				},
+
+				// Service filtering
+				//ordersPhone: { $regex: category, $options: 'i' },
+				//username: { $regex: category, $options: 'i' },
+
 				options.activeOnly ? { isActive: true } : {},
 				merchantsIds && merchantsIds.length > 0
 					? {

diff --git a/packages/core/src/services/warehouses/WarehousesService.ts b/packages/core/src/services/warehouses/WarehousesService.ts
@@ -61,6 +61,7 @@ export class WarehousesService extends DBService<Warehouse>
 
 	/**
 	 * Get Merchants
+	 { ordersPhone: { $regex: searchName, $options: 'i' } }
 	 *
 	 * @param {*} findInput
 	 * @param {IPagingOptions} pagingOptions

diff --git a/packages/shop-mobile-ionic/.env.template b/packages/shop-mobile-ionic/.env.template
@@ -19,9 +19,9 @@ NO_INTERNET_LOGO=assets/imgs/bellem_logo.png
 
 COMPANY_NAME=BellEM Co. LTD
 
-GOOGLE_MAPS_API_KEY=AIzaSyAvUNNXFK3xlzKE21uNkSVM1wROVAjd_Ak
+GOOGLE_MAPS_API_KEY=AIzaSyDudKVRLfNoQFm9JFvGQkGfdxZAbgqXLDE
 
-GOOGLE_ANALYTICS_API_KEY=AIzaSyAvUNNXFK3xlzKE21uNkSVM1wROVAjd_Ak
+GOOGLE_ANALYTICS_API_KEY=AIzaSyDudKVRLfNoQFm9JFvGQkGfdxZAbgqXLDE
 FAKE_UUID=
 
 # Not secret MixPanel Token

diff --git a/packages/shop-mobile-ionic/config.xml b/packages/shop-mobile-ionic/config.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget id="cm.bellem.mobile.customer" version="0.2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>Bellem Shop</name>
-    <description>Bellem Mobile Shop App</description>
+    <name>Bellem</name>
+    <description>Bellem Mobile App</description>
     <author email="[email protected]" href="https://ever.co/">Bellem</author>
     <content src="index.html" />
     <access origin="*" />

diff --git a/packages/shop-mobile-ionic/scripts/env.ts b/packages/shop-mobile-ionic/scripts/env.ts
@@ -103,9 +103,13 @@ export const env: any = cleanEnv(
 
 		COMPANY_NAME: str({ default: 'BellEm. LTD' }),
 
-		GOOGLE_MAPS_API_KEY: str({ default: 'AIzaSyAvUNNXFK3xlzKE21uNkSVM1wROVAjd_Ak' }),
+		GOOGLE_MAPS_API_KEY: str({
+			default: 'AIzaSyAvUNNXFK3xlzKE21uNkSVM1wROVAjd_Ak',
+		}),
 
-		GOOGLE_ANALYTICS_API_KEY: str({ default: 'AIzaSyAvUNNXFK3xlzKE21uNkSVM1wROVAjd_Ak' }),
+		GOOGLE_ANALYTICS_API_KEY: str({
+			default: 'AIzaSyAvUNNXFK3xlzKE21uNkSVM1wROVAjd_Ak',
+		}),
 		FAKE_UUID: str({ default: uuid() }),
 
 		// Not secret MixPanel Token
@@ -144,7 +148,7 @@ export const env: any = cleanEnv(
 		// Graphql endpoints for apollo services
 		GQL_ENDPOINT: str({ default: 'http://bellem.cm:5555/graphql' }),
 		GQL_SUBSCRIPTIONS_ENDPOINT: str({
-			default: 'ws://localhost:5050/subscriptions',
+			default: 'ws://bellem.cm:5050/subscriptions',
 		}),
 		SERVICES_ENDPOINT: str({ default: 'http://bellem.cm:5500' }),
 		HTTPS_SERVICES_ENDPOINT: str({ default: 'https://bellem.cm:5501' }),