WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java

+    }
     @Override
     public void assignTicket(Ticket ticket) throws ProfitMandiBusinessException {
+        this.assignTicket(ticket,0);
+    }
+    @Override
+    public void assignTicket(Ticket ticket,int currentUserId) throws ProfitMandiBusinessException {
         TicketAssigned ticketAssigned = null;
         EscalationType newEscalationType = EscalationType.L1;
         if (ticket.getAssignmentId() > 0) {
             ticketAssigned = ticketAssignedRepository.selectById(ticket.getAssignmentId());
             newEscalationType = ticketAssigned.getEscalationType().next();
         TicketAssigned ticketAssignedNew = new TicketAssigned();
         ticketAssignedNew.setTicketId(ticket.getId());
         ticketAssignedNew.setAssineeId(assigneeAuthId);
         ticketAssignedNew.setEscalationType(assigneeEscalationType);
         ticketAssignedNew.setManagerId(managerAuthId);
+        ticketAssignedNew.setAssignedBy(currentUserId);
         ticketAssignedNew.setCreateTimestamp(LocalDateTime.now());
         ticketAssignedRepository.persist(ticketAssignedNew);
         LOGGER.info(ticketAssigned);
         AuthUser authUser = authRepository.selectById(ticketAssignedNew.getAssineeId());
         ticket.setAssignmentId(ticketAssignedNew.getId());
         List<Activity> activities = activityRepository.selectAll(ticket.getId());
         this.sendAssignedTicketMail(authUser, Arrays.asList(authUserManager), ticket, ticketAssigned != null, activities);
         if (!ticketAssignedNew.getEscalationType().equals(EscalationType.L1)) {
-            this.addActivity(ticket, this.createActivity(ActivityType.ESCALATED, "Ticket ecalated and assigned to " + authUser.getName(), 0));
+            this.addActivity(ticket, this.createActivity(ActivityType.ESCALATED, "Ticket ecalated and assigned to " + authUser.getName(), currentUserId));
         } else {
-            this.addActivity(ticket, this.createActivity(ActivityType.ASSIGNED, "Ticket assigned to " + authUser.getName(), 0));
+            this.addActivity(ticket, this.createActivity(ActivityType.ASSIGNED, "Ticket assigned to " + authUser.getName(), currentUserId));
+        }
+    }
     public void updateTicket(int categoryId, int subCategoryId, Ticket ticket, int authUserId, EscalationType escalationType) throws ProfitMandiBusinessException {
-        this.updateTicket(categoryId, subCategoryId, ticket, authUserId, escalationType, null);
+        this.updateTicket(categoryId, subCategoryId, ticket, authUserId, escalationType, null,0);
+    }
     @Override
-    public void updateTicket(int categoryId, int subCategoryId, Ticket ticket, int authUserId, EscalationType escalationType, ActivityMediaModel recording) throws ProfitMandiBusinessException {
+    public void updateTicket(int categoryId, int subCategoryId, Ticket ticket, int authUserId, EscalationType escalationType, ActivityMediaModel recording,int currentUserId) throws ProfitMandiBusinessException {
         LOGGER.info("subCategoryId {}",subCategoryId);
         TicketSubCategory ticketSubCategory = ticketSubCategoryRepository.getTicketSubCategoryMap().get(subCategoryId);
         if (ticketSubCategory == null) {
             throw new ProfitMandiBusinessException("Could not find subCategoryId " + subCategoryId + "- " + categoryId, "Problem", "Problem");
+        }
+        }
         if (authUserId > 0) {
+            LOGGER.info("authUserId--1111444 {}",authUserId);
             this.assignTicketByAuthId(ticket, authUserId, escalationType);
         } else {
+            LOGGER.info("authUserId--11113355 {}",authUserId);
             ticket.setAssignmentId(0);
-            this.assignTicket(ticket);
+            this.assignTicket(ticket,currentUserId);
+        }
+    }
     private void assignTicketByAuthId(Ticket ticket, int authUserId, EscalationType escalationType) throws ProfitMandiBusinessException {
         } catch (Exception e) {
             LOGGER.error("Failed to send partner notification email for ticket {}", ticket.getId(), e);
+        }
+    }
-    @Override
-    public Set<Integer> getPartnerIdsByAuthUserId(int authUserId) throws ProfitMandiBusinessException {
-        Set<Integer> partnerIds = new HashSet<>();
-        // Get all positions for this auth user
-        List<Position> userPositions = positionRepository.selectAllByAuthUserId(authUserId);
-        // Filter to relevant categories (SALES, RBM, ABM, BI, TRAINING)
-        List<Integer> relevantCategoryIds = Arrays.asList(
-                ProfitMandiConstants.TICKET_CATEGORY_SALES,
-                ProfitMandiConstants.TICKET_CATEGORY_RBM,
-                ProfitMandiConstants.TICKET_CATEGORY_ABM,
-                ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT,
-                ProfitMandiConstants.TICKET_CATEGORY_TRAINING);
-        List<Position> filteredPositions = userPositions.stream()
-                .filter(p -> relevantCategoryIds.contains(p.getCategoryId()))
-                .collect(Collectors.toList());
-        if (filteredPositions.isEmpty()) {
-            return partnerIds;
-        }
-        // Get position IDs
-        List<Integer> positionIds = filteredPositions.stream()
-                .map(Position::getId)
-                .collect(Collectors.toList());
-        // Get partner positions for these positions
-        List<PartnerPosition> partnerPositions = partnerPositionRepository.selectByPositionIds(positionIds);
-        // Check if any position has partnerId = 0 (means all active partners)
-        boolean hasAllPartnersAccess = partnerPositions.stream().anyMatch(pp -> pp.getFofoId() == 0);
-        if (hasAllPartnersAccess) {
-            // Return all active partner IDs
-            partnerIds = fofoStoreRepository.selectActiveStores().stream()
-                    .map(FofoStore::getId)
-                    .collect(Collectors.toSet());
-        } else {
-            // Get partner IDs from direct assignments
-            Set<Integer> directPartnerIds = partnerPositions.stream()
-                    .filter(pp -> pp.getFofoId() != 0)
-                    .map(PartnerPosition::getFofoId)
-                    .collect(Collectors.toSet());
-            partnerIds.addAll(directPartnerIds);
-            // Get partner IDs from region assignments
-            Set<Integer> regionIds = partnerPositions.stream()
-                    .filter(pp -> pp.getRegionId() > 0)
-                    .map(PartnerPosition::getRegionId)
-                    .collect(Collectors.toSet());
-            if (!regionIds.isEmpty()) {
-                List<PartnerRegion> partnerRegions = partnerRegionRepository.selectAllByRegionIds(new ArrayList<>(regionIds));
-                Set<Integer> regionPartnerIds = partnerRegions.stream()
-                        .map(PartnerRegion::getFofoId)
-                        .collect(Collectors.toSet());
-                partnerIds.addAll(regionPartnerIds);
-            }
-        }
-        // Filter to only active partners
-        Set<Integer> activeFofoIds = fofoStoreRepository.selectActiveStores().stream()
-                .map(FofoStore::getId)
-                .collect(Collectors.toSet());
-        partnerIds.retainAll(activeFofoIds);
-        return partnerIds;
-    }
+}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/dao/repository/cs/CsServiceImpl.java – Rev 35647 → 35683