Merge pull request #397 from salemove/feature/MOB-1592_handle_unstaffed_queue_ticket_using_ticket_subscription

Author: sm-deployer

widgetssdk/src/main/java/com/glia/widgets/call/CallController.java

@@ -35,6 +35,7 @@
 import com.glia.widgets.core.permissions.domain.HasCallNotificationChannelEnabledUseCase;
 import com.glia.widgets.core.queue.domain.GliaCancelQueueTicketUseCase;
 import com.glia.widgets.core.queue.domain.GliaQueueForMediaEngagementUseCase;
+import com.glia.widgets.core.queue.domain.QueueTicketStateChangeToUnstaffedUseCase;
 import com.glia.widgets.core.queue.domain.exception.QueueingOngoingException;
 import com.glia.widgets.core.survey.OnSurveyListener;
 import com.glia.widgets.core.survey.domain.GliaSurveyUseCase;
@@ -95,6 +96,7 @@ public class CallController implements
     private final ToggleVisitorVideoUseCase toggleVisitorVideoUseCase;
     private final GetEngagementStateFlowableUseCase getGliaEngagementStateFlowableUseCase;
     private final UpdateFromCallScreenUseCase updateFromCallScreenUseCase;
+    private final QueueTicketStateChangeToUnstaffedUseCase ticketStateChangeToUnstaffedUseCase;
 
     private final GliaOperatorMediaRepository.OperatorMediaStateListener operatorMediaStateListener = this::onNewOperatorMediaState;
 
@@ -132,7 +134,8 @@ public CallController(
             ToggleVisitorAudioMediaMuteUseCase toggleVisitorAudioMediaMuteUseCase,
             ToggleVisitorVideoUseCase toggleVisitorVideoUseCase,
             GetEngagementStateFlowableUseCase getGliaEngagementStateFlowableUseCase,
-            UpdateFromCallScreenUseCase updateFromCallScreenUseCase) {
+            UpdateFromCallScreenUseCase updateFromCallScreenUseCase,
+            QueueTicketStateChangeToUnstaffedUseCase ticketStateChangeToUnstaffedUseCase) {
         Logger.d(TAG, "constructor");
         this.viewCallback = callViewCallback;
         this.callState = new CallState.Builder()
@@ -173,6 +176,7 @@ public CallController(
         this.toggleVisitorVideoUseCase = toggleVisitorVideoUseCase;
         this.getGliaEngagementStateFlowableUseCase = getGliaEngagementStateFlowableUseCase;
         this.updateFromCallScreenUseCase = updateFromCallScreenUseCase;
+        this.ticketStateChangeToUnstaffedUseCase = ticketStateChangeToUnstaffedUseCase;
     }
 
     @Override
@@ -448,6 +452,7 @@ public void onSpeakerButtonPressed() {
 
     public void queueForEngagementStarted() {
         Logger.d(TAG, "queueForEngagementStarted");
+        observeQueueTicketState();
     }
 
     public void queueForEngagementStopped() {
@@ -477,6 +482,10 @@ public boolean shouldShowMediaEngagementView(boolean isUpgradeToCall) {
         return shouldShowMediaEngagementViewUseCase.execute(isUpgradeToCall);
     }
 
+    public void onBackClicked() {
+        updateFromCallScreenUseCase.updateFromCallScreen(false);
+    }
+
     private synchronized void emitViewState(CallState state) {
         if (setState(state) && viewCallback != null) {
             Logger.d(TAG, "Emit state:\n" + state.toString());
@@ -793,7 +802,14 @@ private void minimizeView() {
         if (viewCallback != null) viewCallback.minimizeView();
     }
 
-    public void onBackClicked() {
-        updateFromCallScreenUseCase.updateFromCallScreen(false);
+    private void observeQueueTicketState() {
+        Logger.d(TAG, "observeQueueTicketState");
+        disposable.add(
+                ticketStateChangeToUnstaffedUseCase
+                        .execute()
+                        .subscribe(dialogController::showNoMoreOperatorsAvailableDialog,
+                                error -> Logger.e(TAG, "Error happened while observing queue state : " + error.toString())
+                        )
+        );
     }
 }

widgetssdk/src/main/java/com/glia/widgets/chat/controller/ChatController.java

@@ -79,6 +79,7 @@
 import com.glia.widgets.core.operator.domain.AddOperatorMediaStateListenerUseCase;
 import com.glia.widgets.core.queue.domain.GliaCancelQueueTicketUseCase;
 import com.glia.widgets.core.queue.domain.GliaQueueForChatEngagementUseCase;
+import com.glia.widgets.core.queue.domain.QueueTicketStateChangeToUnstaffedUseCase;
 import com.glia.widgets.core.queue.domain.exception.QueueingOngoingException;
 import com.glia.widgets.core.survey.OnSurveyListener;
 import com.glia.widgets.core.survey.domain.GliaSurveyUseCase;
@@ -201,6 +202,7 @@ public void error(GliaException ex) {
     private final CustomCardTypeUseCase customCardTypeUseCase;
     private final CustomCardInteractableUseCase customCardInteractableUseCase;
     private final CustomCardShouldShowUseCase customCardShouldShowUseCase;
+    private final QueueTicketStateChangeToUnstaffedUseCase ticketStateChangeToUnstaffedUseCase;
 
     private boolean isVisitorEndEngagement = false;
     private volatile boolean isChatViewPaused = false;
@@ -247,7 +249,8 @@ public ChatController(
             CustomCardAdapterTypeUseCase customCardAdapterTypeUseCase,
             CustomCardTypeUseCase customCardTypeUseCase,
             CustomCardInteractableUseCase customCardInteractableUseCase,
-            CustomCardShouldShowUseCase customCardShouldShowUseCase) {
+            CustomCardShouldShowUseCase customCardShouldShowUseCase,
+            QueueTicketStateChangeToUnstaffedUseCase ticketStateChangeToUnstaffedUseCase) {
         this.isFromCallScreenUseCase = isFromCallScreenUseCase;
         this.updateFromCallScreenUseCase = updateFromCallScreenUseCase;
         Logger.d(TAG, "constructor");
@@ -314,6 +317,7 @@ public ChatController(
         this.customCardTypeUseCase = customCardTypeUseCase;
         this.customCardInteractableUseCase = customCardInteractableUseCase;
         this.customCardShouldShowUseCase = customCardShouldShowUseCase;
+        this.ticketStateChangeToUnstaffedUseCase = ticketStateChangeToUnstaffedUseCase;
     }
 
     public void setPhotoCaptureFileUri(Uri photoCaptureFileUri) {
@@ -1472,6 +1476,7 @@ public void notificationsDialogDismissed() {
 
     public void queueForEngagementStarted() {
         Logger.d(TAG, "queueForEngagementStarted");
+        observeQueueTicketState();
         viewInitQueueing();
     }
 
@@ -1560,4 +1565,15 @@ private void updateAllowFileSendState() {
     private void onSiteInfoReceived(@Nullable SiteInfo siteInfo) {
         emitViewState(chatState.allowSendAttachmentStateChanged(siteInfo == null || siteInfo.getAllowedFileSenders().isVisitorAllowed()));
     }
+
+    private void observeQueueTicketState() {
+        Logger.d(TAG, "observeQueueTicketState");
+        disposable.add(
+                ticketStateChangeToUnstaffedUseCase
+                        .execute()
+                        .subscribe(dialogController::showNoMoreOperatorsAvailableDialog,
+                                error -> Logger.e(TAG, "Error happened while observing queue state : " + error.toString())
+                        )
+        );
+    }
 }

widgetssdk/src/main/java/com/glia/widgets/core/queue/GliaQueueRepository.java

@@ -1,14 +1,19 @@
 package com.glia.widgets.core.queue;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
 import com.glia.androidsdk.Engagement;
 import com.glia.androidsdk.Glia;
 import com.glia.androidsdk.GliaException;
+import com.glia.androidsdk.RequestCallback;
 import com.glia.androidsdk.queuing.QueueTicket;
 import com.glia.widgets.core.queue.model.GliaQueueingState;
 import com.glia.widgets.di.GliaCore;
 import com.glia.widgets.helper.Logger;
 
 import io.reactivex.Completable;
+import io.reactivex.CompletableEmitter;
 import io.reactivex.Single;
 
 public class GliaQueueRepository {
@@ -22,6 +27,12 @@ public GliaQueueRepository(GliaCore gliaCore) {
         this.gliaCore = gliaCore;
     }
 
+    @VisibleForTesting
+    public GliaQueueRepository(GliaCore gliaCore, GliaQueueingState queueingState) {
+        this.gliaCore = gliaCore;
+        this.queueingState = queueingState;
+    }
+
     public Completable startQueueingForEngagement(
             String queueId,
             String  visitorContextAssetId
@@ -124,4 +135,26 @@ public Completable setQueueingChat(String queueId, String queueTicket) {
     public GliaQueueingState getQueueingState() {
         return queueingState;
     }
+
+    /**
+     * Completes when ongoing queue ticket state changes to {@link QueueTicket.State.UNSTAFFED}
+     */
+    public Completable observeQueueTicketStateChangeToUnstaffed() {
+        return Completable.create(emitter ->
+                gliaCore.subscribeToQueueTicketUpdates(
+                        queueingState.getTicketId(),
+                        emitOnQueueTicketChangeToUnstaffed(emitter)));
+    }
+
+    @VisibleForTesting
+    @NonNull
+    public RequestCallback<QueueTicket> emitOnQueueTicketChangeToUnstaffed(CompletableEmitter emitter) {
+        return (queueTicket, e) -> {
+            if (queueTicket.getState() == QueueTicket.State.UNSTAFFED) {
+                emitter.onComplete();
+            }
+        };
+    }
+
+
 }

widgetssdk/src/main/java/com/glia/widgets/core/queue/domain/QueueTicketStateChangeToUnstaffedUseCase.java

@@ -0,0 +1,17 @@
+package com.glia.widgets.core.queue.domain;
+
+import com.glia.widgets.core.queue.GliaQueueRepository;
+
+import io.reactivex.Completable;
+
+public class QueueTicketStateChangeToUnstaffedUseCase {
+    private final GliaQueueRepository gliaQueueRepository;
+
+    public QueueTicketStateChangeToUnstaffedUseCase(GliaQueueRepository gliaQueueRepository) {
+        this.gliaQueueRepository = gliaQueueRepository;
+    }
+
+    public Completable execute() {
+        return gliaQueueRepository.observeQueueTicketStateChangeToUnstaffed();
+    }
+}

widgetssdk/src/main/java/com/glia/widgets/di/ControllerFactory.java

@@ -110,7 +110,8 @@ public ChatController getChatController(ChatViewCallback chatViewCallback) {
                     useCaseFactory.createCustomCardAdapterTypeUseCase(),
                     useCaseFactory.createCustomCardTypeUseCase(),
                     useCaseFactory.createCustomCardInteractableUseCase(),
-                    useCaseFactory.createCustomCardShouldShowUseCase());
+                    useCaseFactory.createCustomCardShouldShowUseCase(),
+                    useCaseFactory.createQueueTicketStateChangeToUnstaffedUseCase());
         } else {
             Logger.d(TAG, "retained chat controller");
             retainedChatController.setViewCallback(chatViewCallback);
@@ -149,7 +150,8 @@ public CallController getCallController(CallViewCallback callViewCallback) {
                     useCaseFactory.createToggleVisitorAudioMediaMuteUseCase(),
                     useCaseFactory.createToggleVisitorVideoUseCase(),
                     useCaseFactory.createGetGliaEngagementStateFlowableUseCase(),
-                    useCaseFactory.createUpdateFromCallScreenUseCase());
+                    useCaseFactory.createUpdateFromCallScreenUseCase(),
+                    useCaseFactory.createQueueTicketStateChangeToUnstaffedUseCase());
         } else {
             Logger.d(TAG, "retained call controller");
             retainedCallController.setViewCallback(callViewCallback);

widgetssdk/src/main/java/com/glia/widgets/di/GliaCore.java

@@ -17,6 +17,7 @@
 import com.glia.androidsdk.engagement.Survey;
 import com.glia.androidsdk.fcm.PushNotifications;
 import com.glia.androidsdk.queuing.Queue;
+import com.glia.androidsdk.queuing.QueueTicket;
 import com.glia.androidsdk.site.SiteInfo;
 import com.glia.androidsdk.visitor.VisitorInfo;
 import com.glia.androidsdk.visitor.VisitorInfoUpdateRequest;
@@ -74,6 +75,8 @@ void queueForEngagement(@NonNull String queueId,
 
     void unsubscribeFromQueueUpdates(Consumer<GliaException> onError, Consumer<Queue> callback);
 
+    void subscribeToQueueTicketUpdates(@NonNull String ticketId, RequestCallback<QueueTicket> callback);
+
     void onRequestPermissionsResult(int requestCode, String[] permissions, @NonNull int[] grantResults);
 
     void submitSurveyAnswers(@NonNull List<Survey.Answer> answers,

widgetssdk/src/main/java/com/glia/widgets/di/GliaCoreImpl.java

@@ -17,6 +17,7 @@
 import com.glia.androidsdk.engagement.Survey;
 import com.glia.androidsdk.fcm.PushNotifications;
 import com.glia.androidsdk.queuing.Queue;
+import com.glia.androidsdk.queuing.QueueTicket;
 import com.glia.androidsdk.site.SiteInfo;
 import com.glia.androidsdk.visitor.VisitorInfo;
 import com.glia.androidsdk.visitor.VisitorInfoUpdateRequest;
@@ -140,6 +141,12 @@ public void unsubscribeFromQueueUpdates(Consumer<GliaException> onError,
         Glia.unsubscribeFromQueueUpdates(onError, callback);
     }
 
+    @Override
+    public void subscribeToQueueTicketUpdates(@NonNull String ticketId,
+                                              RequestCallback<QueueTicket> callback) {
+        Glia.subscribeToQueueTicketUpdates(ticketId, callback);
+    }
+
     @Override
     public void onRequestPermissionsResult(int requestCode,
                                            String[] permissions,

widgetssdk/src/main/java/com/glia/widgets/di/UseCaseFactory.java

@@ -34,6 +34,7 @@
 import com.glia.widgets.core.engagement.domain.GliaOnEngagementEndUseCase;
 import com.glia.widgets.core.engagement.domain.GliaOnEngagementUseCase;
 import com.glia.widgets.core.engagement.domain.MapOperatorUseCase;
+import com.glia.widgets.core.queue.domain.QueueTicketStateChangeToUnstaffedUseCase;
 import com.glia.widgets.core.survey.domain.GliaSurveyUseCase;
 import com.glia.widgets.core.engagement.domain.ShouldShowMediaEngagementViewUseCase;
 import com.glia.widgets.core.fileupload.domain.AddFileAttachmentsObserverUseCase;
@@ -435,4 +436,8 @@ public CustomCardInteractableUseCase createCustomCardInteractableUseCase() {
     public CustomCardShouldShowUseCase createCustomCardShouldShowUseCase() {
         return new CustomCardShouldShowUseCase(GliaWidgets.getCustomCardAdapter());
     }
+
+    public QueueTicketStateChangeToUnstaffedUseCase createQueueTicketStateChangeToUnstaffedUseCase() {
+        return new QueueTicketStateChangeToUnstaffedUseCase(repositoryFactory.getGliaQueueRepository());
+    }
 }

widgetssdk/src/main/res/values/strings.xml

@@ -93,7 +93,7 @@
     <string name="glia_dialog_upgrade_decline">@string/glia_dialog_decline</string>
 
     <!-- Operators unavailable AlertDialog -->
-    <string name="glia_dialog_operators_unavailable_title">Operators Not Available</string>
+    <string name="glia_dialog_operators_unavailable_title">We\'re sorry</string>
     <string name="glia_dialog_operators_unavailable_message">Operators are no longer available. Please try again later.</string>
 
     <!-- Unexpected error AlertDialog -->