@janiscommerce/app-tracking-shift 1.5.0 → 1.7.0-beta.0

package/lib/Shift.js

@@ -10,6 +10,7 @@ import {
 	isValidObject,
 	isApiError,
 	isInternetReachable,
+	isValidString,
 } from './utils/helpers';
 import {getStaffAuthorizationData} from './utils/storage';
 import {
@@ -95,6 +96,10 @@ class Shift {
 		return !!Storage.get(CURRENT_WORKLOG_ID);
 	}
 
+	get isOpen() {
+		return this.status === 'opened';
+	}
+
 	/**
 	 * Get if the shift is paused
 	 * @returns {boolean} true if the shift is paused, false otherwise
@@ -130,7 +135,7 @@ class Shift {
 	 * @returns {Promise<string>} shiftId => ID related to the shift that has just been opened for the user
 	 */
 
-	async open() {
+	async open({warehouseId = ''} = {}) {
 		try {
 			Crashlytics.log('openShift:');
 
@@ -138,7 +143,7 @@ class Shift {
 				this._throwAuthorizationError();
 			}
 
-			const {result: shift} = await StaffService.openShift();
+			const {result: shift} = await StaffService.openShift({warehouseId});
 			const {id: shiftId = ''} = shift || {};
 			const shiftData = await this.getUserOpenShift({id: shiftId});
 
@@ -157,6 +162,48 @@ class Shift {
 		}
 	}
 
+	/**
+	 * Update the shift data in the staff MS and record this change in shift database.
+	 * @param {Object} params
+	 * @param {string} params.warehouseId => Warehouse ID related to the shift
+	 * @throws {Error} error
+	 * @returns {Promise<string>} shiftId => ID related to the shift that has just been updated for the user
+	 */
+
+	async update({warehouseId = ''} = {}) {
+		try {
+			Crashlytics.log('[updateShift]:');
+
+			if (!this.hasStaffAuthorization) {
+				this._throwAuthorizationError();
+			}
+
+			if (this.isClosed()) return null;
+
+			// Avoid unnecessary updates if warehouseId hasn't changed
+			if (this.data?.warehouseId === warehouseId) {
+				return this.id;
+			}
+
+			const {result: shift} = await StaffService.updateShift({warehouseId});
+			const {id: shiftId = ''} = shift || {};
+
+			this.data = {
+				...this.data,
+				warehouseId,
+			};
+
+			return shiftId;
+		} catch (error) {
+			const parsedError = errorParser(error);
+			Crashlytics.recordError(
+				parsedError,
+				'[updateShift]: An error occurred while trying to update the shift'
+			);
+			return Promise.reject(parsedError);
+		}
+	}
+
 	/**
 	 * Finish a work shift in the staff MS and record this event in the time tracking database.
 	 * @param {Object} params
@@ -506,7 +553,8 @@ class Shift {
 				throw new Error('The deadline for ending the shift has been exceeded');
 			}
 
-			await StaffService.openShift();
+			await StaffService.openShift({warehouseId: this.data?.warehouseId});
+			this.status = 'opened';
 			this._extendShiftClosingDate();
 
 			return null;

package/lib/StaffApiServices.js

@@ -1,4 +1,5 @@
 import Request from './utils/request';
+import {isValidString} from './utils/helpers';
 
 class StaffApiServices {
 	constructor() {
@@ -7,20 +8,45 @@ class StaffApiServices {
 
 	/**
 	 * Opens an user's shift
+	 * @param {Object} params
+	 * @param {string} params.warehouseId - shift current warehouse ID
 	 * @returns {Promise<Object>} - Response from the API
 	 */
 
-	async openShift() {
+	async openShift({warehouseId} = {}) {
 		try {
 			return await Request.post({
 				service: this.service,
 				namespace: 'shift-open',
+				body: {
+					...(isValidString(warehouseId) && {warehouseId}),
+				},
 			});
 		} catch (error) {
 			return Promise.reject(error);
 		}
 	}
 
+	/**
+	 * Updates the current user's shift
+	 * @param {Object} params
+	 * @param {string} params.warehouseId - shift current warehouse ID
+	 * @returns {Promise<Object>} - Response from the API
+	 */
+
+	async updateShift({warehouseId} = {}) {
+		try {
+			return await Request.post({
+				service: this.service,
+				namespace: 'shift-update',
+				body: {
+					...(isValidString(warehouseId) && {warehouseId}),
+				},
+			});
+		} catch (error) {
+			return Promise.reject(error);
+		}
+	}
 	/**
 	 * Closes current user's shift
 	 * @returns {Promise<Object>} - Response from the API

package/lib/provider/ShiftTrackingProvider.js

@@ -20,7 +20,15 @@ import {
 import {isValidObject, promiseWrapper} from '../utils/helpers';
 import Shift from '../Shift';
 
-const ShiftTrackingProvider = ({children, onError = null}) => {
+/**
+ * ShiftTrackingProvider component
+ * @param {Object} props
+ * @param {React.ReactNode} props.children - Child components
+ * @param {Object} props.additionalInfo - Additional information for shift tracking
+ * @param {string} props.additionalInfo.warehouseId - Warehouse ID to associate with the shift
+ * @param {Function} props.onError - Error callback handler
+ */
+const ShiftTrackingProvider = ({children, additionalInfo = {}, onError = null}) => {
 	const shiftStatus = useStorageValue(SHIFT_STATUS);
 	const shiftId = useStorageValue(SHIFT_ID);
 	const shiftData = useStorageValue(SHIFT_DATA, {});
@@ -40,6 +48,7 @@ const ShiftTrackingProvider = ({children, onError = null}) => {
 
 	const {workLogTypes = []} = workLogData;
 	const {hasStaffAuthorization = false} = staffAuthData;
+	const {warehouseId = ''} = additionalInfo;
 
 	const contextValues = useMemo(() => {
 		return {
@@ -66,7 +75,7 @@ const ShiftTrackingProvider = ({children, onError = null}) => {
 		isShiftLoading,
 	]);
 
-	const handleShiftTrackingInit = async () => {
+	const shiftInitialization = async () => {
 		setIsShiftLoading(true);
 		const [isAuthorized, authError] = await promiseWrapper(isAuthorizedToUseStaffMS());
 
@@ -84,7 +93,12 @@ const ShiftTrackingProvider = ({children, onError = null}) => {
 			return;
 		}
 
-		const [shiftResult, openError] = await promiseWrapper(openShift(onError));
+		const [shiftResult, openError] = await promiseWrapper(
+			openShift({
+				warehouseId,
+				onOpenShiftError: onError,
+			})
+		);
 
 		if (openError) {
 			setIsShiftLoading(false);
@@ -146,9 +160,25 @@ const ShiftTrackingProvider = ({children, onError = null}) => {
 	};
 
 	useEffect(() => {
-		handleShiftTrackingInit();
+		shiftInitialization();
 	}, []);
 
+	useEffect(() => {
+		const handleWarehouseChange = async () => {
+			if (warehouseId && Shift.isOpen) {
+				try {
+					await Shift.update({warehouseId});
+				} catch (errorWarehouseChange) {
+					setError({
+						message: errorWarehouseChange?.message,
+						type: 'updateShift',
+					});
+				}
+			}
+		};
+		handleWarehouseChange();
+	}, [warehouseId]);
+
 	useEffect(() => {
 		if (openShiftResult?.id && openShiftResult?.getWorkLogs) {
 			getShiftWorkLogsHistory();

package/lib/utils/helpers/index.js

@@ -22,3 +22,5 @@ export const reverseArray = (arr) => arr.slice().reverse();
 export const isNumber = (num) => typeof num === 'number' && !Number.isNaN(Number(num));
 
 export const isValidObject = (obj) => isObject(obj) && !!Object.keys(obj).length;
+
+export const isValidString = (str) => typeof str === 'string' && str.length > 0;

package/lib/utils/provider/openShift/index.js

@@ -4,13 +4,12 @@ import Shift from '../../../Shift';
 import {isFunction} from '../../helpers';
 import errorParser from '../../errorParser';
 
-const openShift = async (onOpenShiftError) => {
+const openShift = async ({onOpenShiftError, warehouseId}) => {
 	try {
 		const userId = await getUserId();
-
 		if (!userId) {
 			await Shift.deleteShiftRegisters();
-			const openShiftId = await Shift.open();
+			const openShiftId = await Shift.open({warehouseId});
 			return {
 				openShiftId,
 				getWorkLogs: true,
@@ -20,7 +19,7 @@ const openShift = async (onOpenShiftError) => {
 		const currentShift = await Shift.getUserOpenShift({id: Shift.id, userId});
 		if (currentShift?.status !== 'opened') {
 			await Shift.deleteShiftRegisters();
-			const openShiftId = await Shift.open();
+			const openShiftId = await Shift.open({warehouseId});
 			return {
 				openShiftId,
 				getWorkLogs: true,
@@ -37,6 +36,7 @@ const openShift = async (onOpenShiftError) => {
 		Shift.id = currentShift.id;
 		Shift.status = currentShift.status;
 		Shift.data = currentShift;
+
 		return {
 			openShiftId: currentShift.id,
 			getWorkLogs: true,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@janiscommerce/app-tracking-shift",
-	"version": "1.5.0",
+	"version": "1.7.0-beta.0",
 	"main": "lib/index.js",
 	"module": "lib/index.js",
 	"exports": {
@@ -49,8 +49,9 @@
 		"@janiscommerce/app-device-info": "^1.1.0",
 		"@janiscommerce/app-request": ">=2.0.0",
 		"@janiscommerce/app-storage": ">=1.1.0",
-		"react": ">=17.0.2 <19",
-		"react-native": ">=0.67.5 <0.75"
+		"react": ">=17.0.2 <20.0.0",
+		"react-dom": ">=17.0.2 <20.0.0",
+		"react-native": ">=0.71.5 <0.82.0"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.0.0",
@@ -79,6 +80,7 @@
 		"jest-environment-jsdom": "^29.0.0",
 		"prettier": "^2.8.8",
 		"react": "18.2.0",
+		"react-dom": "18.2.0",
 		"react-native": "0.71.6",
 		"react-native-device-info": "^10.12.0",
 		"react-native-mmkv": "2.12.2",