feat: add API endpoints and service methods for onboarding, completed, and dropped CRM entries

Skywalker690 · Skywalker690 · commit ff93d3fa4edc · 2026-02-24T20:46:49.000+05:30
diff --git a/client/pages/CompaniesPage.tsx b/client/pages/CompaniesPage.tsx
@@ -24,18 +24,37 @@ export const CompaniesPage: React.FC = () => {
   const [isViewModalOpen, setIsViewModalOpen] = useState(false);
   const [isEditModalOpen, setIsEditModalOpen] = useState(false);
   const [deleteId, setDeleteId] = useState<number | null>(null);
+  
+  // Track which tabs have been loaded to avoid duplicate calls
+  const [loadedTabs, setLoadedTabs] = useState<Set<string>>(new Set(['active']));
 
   const [filters, setFilters] = useState<CompanyFilterState>({
     search: '',
     status: '',
     workType: ''
   });
 
-  const fetchData = async () => {
+  const fetchDataForTab = async (tab: 'active' | 'dropped' | 'past') => {
     setIsLoading(true);
     try {
-      const data = await companiesApi.getAll();
+      let data: CRMEntry[];
+      
+      switch (tab) {
+        case 'active':
+          data = await companiesApi.getOnboarded();
+          break;
+        case 'dropped':
+          data = await companiesApi.getClosed();
+          break;
+        case 'past':
+          data = await companiesApi.getDone();
+          break;
+        default:
+          data = [];
+      }
+      
       setCrmEntries(data);
+      setLoadedTabs(prev => new Set(prev).add(tab));
     } catch (error) {
       console.error("Failed to fetch data", error);
       showToast("Failed to load companies", "error");
@@ -44,36 +63,28 @@ export const CompaniesPage: React.FC = () => {
     }
   };
 
+  // Initial load - fetch only onboarded (active) companies
   useEffect(() => {
     let mounted = true;
     const loadData = async () => {
       if (mounted) {
-        await fetchData();
+        await fetchDataForTab('active');
       }
     };
     loadData();
     return () => { mounted = false; };
   }, []);
 
-  const allCompanies = useMemo(() => {
-    // Registry now strictly includes those that have passed initial lead stages
-    return crmEntries.filter(entry => ['onboarded', 'on progress', 'Quote Sent', 'completed', 'drop'].includes(entry.status));
-  }, [crmEntries]);
-
-  const categorizedData = useMemo(() => {
-      // Onboarded, On Progress, and Quote Sent are considered active Focus nodes in the registry
-      const active = allCompanies.filter(c => ['onboarded', 'on progress', 'Quote Sent'].includes(c.status));
-      const dropped = allCompanies.filter(c => c.status === 'drop');
-      const past = allCompanies.filter(c => c.status === 'completed');
-      return { active, dropped, past };
-  }, [allCompanies]);
+  // Handle tab changes - fetch data only if not already loaded
+  useEffect(() => {
+    if (!loadedTabs.has(activeTab)) {
+      fetchDataForTab(activeTab);
+    }
+  }, [activeTab]);
 
+  // No need for categorization - data comes pre-filtered from backend
   const displayData = useMemo(() => {
-    let sourceList = categorizedData.active;
-    if (activeTab === 'dropped') sourceList = categorizedData.dropped;
-    if (activeTab === 'past') sourceList = categorizedData.past;
-
-    let result = sourceList.filter(item => {
+    let result = crmEntries.filter(item => {
       const matchesSearch = filters.search === '' || 
         (item.company || '').toLowerCase().includes(filters.search.toLowerCase()) ||
         (item.contactName && item.contactName.toLowerCase().includes(filters.search.toLowerCase())) ||
@@ -86,7 +97,7 @@ export const CompaniesPage: React.FC = () => {
     });
 
     return result.sort((a, b) => b.id - a.id);
-  }, [categorizedData, activeTab, filters]);
+  }, [crmEntries, filters]);
 
   const handleEdit = (company: CRMEntry) => {
       setEditingCompany(company);
@@ -107,8 +118,10 @@ export const CompaniesPage: React.FC = () => {
           try {
             await companiesApi.update(updatedEntry.id, updatedEntry);
             showToast("Company details updated", "success");
+            // Refresh current tab data
+            await fetchDataForTab(activeTab);
           } catch(e) {
-            fetchData();
+            await fetchDataForTab(activeTab);
             showToast("Failed to update company", "error");
           }
       }
@@ -125,12 +138,15 @@ export const CompaniesPage: React.FC = () => {
       try {
           await companiesApi.update(company.id, updatedEntry);
           showToast(`Status updated to ${newStatus}`, "success");
-          // If status changes out of registry criteria, re-fetch to update view
-          if (!['onboarded', 'on progress', 'Quote Sent', 'completed', 'drop'].includes(newStatus)) {
-              fetchData();
-          }
+          
+          // Status change may move company to different tab
+          // Clear loaded tabs cache to force refresh when switching tabs
+          setLoadedTabs(new Set([activeTab]));
+          
+          // Refresh current tab to reflect changes
+          await fetchDataForTab(activeTab);
       } catch (e) {
-          fetchData();
+          await fetchDataForTab(activeTab);
           showToast("Failed to update status", "error");
       }
   };
@@ -177,7 +193,7 @@ export const CompaniesPage: React.FC = () => {
                         }`}
                     >
                         Active Focus
-                        <span className="ml-2 px-1.5 lg:px-2 py-0.5 rounded bg-brand-50 text-brand-600 text-[9px] lg:text-[10px]">{categorizedData.active.length}</span>
+                        {activeTab === 'active' && <span className="ml-2 px-1.5 lg:px-2 py-0.5 rounded bg-brand-50 text-brand-600 text-[9px] lg:text-[10px]">{crmEntries.length}</span>}
                     </button>
                     <button 
                         onClick={() => setActiveTab('past')}
@@ -188,7 +204,7 @@ export const CompaniesPage: React.FC = () => {
                         }`}
                     >
                         Historical
-                        <span className="ml-2 px-1.5 lg:px-2 py-0.5 rounded bg-emerald-50 text-emerald-600 text-[9px] lg:text-[10px]">{categorizedData.past.length}</span>
+                        {activeTab === 'past' && <span className="ml-2 px-1.5 lg:px-2 py-0.5 rounded bg-emerald-50 text-emerald-600 text-[9px] lg:text-[10px]">{crmEntries.length}</span>}
                     </button>
                     <button 
                         onClick={() => setActiveTab('dropped')}
@@ -199,12 +215,12 @@ export const CompaniesPage: React.FC = () => {
                         }`}
                     >
                         Archived
-                        <span className="ml-2 px-1.5 lg:px-2 py-0.5 rounded bg-rose-50 text-rose-600 text-[9px] lg:text-[10px]">{categorizedData.dropped.length}</span>
+                        {activeTab === 'dropped' && <span className="ml-2 px-1.5 lg:px-2 py-0.5 rounded bg-rose-50 text-rose-600 text-[9px] lg:text-[10px]">{crmEntries.length}</span>}
                     </button>
                 </div>
             </div>
 
-            <CompaniesFilters filters={filters} setFilters={setFilters} onRefresh={fetchData} />
+            <CompaniesFilters filters={filters} setFilters={setFilters} onRefresh={() => fetchDataForTab(activeTab)} />
             
             <div className="pt-4 pb-10 overflow-x-auto">
                 <CompaniesTable 
diff --git a/client/services/api.ts b/client/services/api.ts
@@ -5,10 +5,9 @@ import { CRMEntry, Task, Meeting, AuthResponse, User, ForgotPasswordRequest, Ver
 // ⚙️ API CONFIGURATION
 // ============================================================================
 
-//const API_URL = import.meta.env.VITE_API_URL || '/api/v1';
-
-const API_URL = 'http://localhost:8080/api/v1';
+const API_URL = import.meta.env.VITE_API_URL || '/api/v1';
 
+//const API_URL = 'http://localhost:8080/api/v1';
 
 
 const api = axios.create({
@@ -178,18 +177,47 @@ export const companiesApi = {
             ...item,
             company: item.name || item.company
         }));
-    } catch (error: any) { 
-        console.warn("Primary companies endpoint failed, attempting fallback to CRM...", error.message);
-        try {
-            const res = await api.get("/crm/all");
-            const data = res.data.crmList || [];
-            return data.map((item: any) => ({
-                ...item,
-                company: item.name || item.company
-            }));
-        } catch (fallbackError) {
-            throw handleApiError(error); 
-        }
+    } catch (error: any) {
+        throw handleApiError(error);
+    }
+  },
+
+  getOnboarded: async (): Promise<CRMEntry[]> => {
+    try {
+        const res = await api.get("/crm/onboarded");
+        const data = Array.isArray(res.data) ? res.data : [];
+        return data.map((item: any) => ({
+            ...item,
+            company: item.name || item.company
+        }));
+    } catch (error: any) {
+        throw handleApiError(error);
+    }
+  },
+
+  getDone: async (): Promise<CRMEntry[]> => {
+    try {
+        const res = await api.get("/crm/done");
+        const data = Array.isArray(res.data) ? res.data : [];
+        return data.map((item: any) => ({
+            ...item,
+            company: item.name || item.company
+        }));
+    } catch (error: any) {
+        throw handleApiError(error);
+    }
+  },
+
+  getClosed: async (): Promise<CRMEntry[]> => {
+    try {
+        const res = await api.get("/crm/closed");
+        const data = Array.isArray(res.data) ? res.data : [];
+        return data.map((item: any) => ({
+            ...item,
+            company: item.name || item.company
+        }));
+    } catch (error: any) {
+        throw handleApiError(error);
     }
   },
   
diff --git a/server/src/main/java/com/incial/crm/controller/CrmController.java b/server/src/main/java/com/incial/crm/controller/CrmController.java
@@ -28,6 +28,30 @@ public ResponseEntity<Map<String, List<CrmEntryDto>>> getAllEntries() {
         return ResponseEntity.ok(crmService.getAllEntries());
     }
 
+    @GetMapping("/onboarded")
+    @PreAuthorize(
+            "hasAuthority('ROLE_ADMIN') or hasAuthority('ROLE_SUPER_ADMIN') or hasAuthority('ROLE_EMPLOYEE')"
+    )
+    public ResponseEntity<List<CrmEntryDto>> getOnboardedEntries() {
+        return ResponseEntity.ok(crmService.getOnboardedEntries());
+    }
+
+    @GetMapping("/done")
+    @PreAuthorize(
+            "hasAuthority('ROLE_ADMIN') or hasAuthority('ROLE_SUPER_ADMIN') or hasAuthority('ROLE_EMPLOYEE')"
+    )
+    public ResponseEntity<List<CrmEntryDto>> getCompletedEntries() {
+        return ResponseEntity.ok(crmService.getCompletedEntries());
+    }
+
+    @GetMapping("/closed")
+    @PreAuthorize(
+            "hasAuthority('ROLE_ADMIN') or hasAuthority('ROLE_SUPER_ADMIN') or hasAuthority('ROLE_EMPLOYEE')"
+    )
+    public ResponseEntity<List<CrmEntryDto>> getDroppedEntries() {
+        return ResponseEntity.ok(crmService.getDroppedEntries());
+    }
+
     @GetMapping("/details/{id}")
     @PreAuthorize(
             "hasAuthority('ROLE_ADMIN') or hasAuthority('ROLE_SUPER_ADMIN') or hasAuthority('ROLE_EMPLOYEE')"
diff --git a/server/src/main/java/com/incial/crm/entity/CrmEntry.java b/server/src/main/java/com/incial/crm/entity/CrmEntry.java
@@ -14,7 +14,9 @@
 import java.util.Map;
 
 @Entity
-@Table(name = "crm_entries")
+@Table(name = "crm_entries", indexes = {
+    @Index(name = "idx_crm_status", columnList = "status")
+})
 @Data
 @Builder
 @NoArgsConstructor
diff --git a/server/src/main/java/com/incial/crm/repository/CrmEntryRepository.java b/server/src/main/java/com/incial/crm/repository/CrmEntryRepository.java
@@ -2,8 +2,24 @@
 
 import com.incial.crm.entity.CrmEntry;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface CrmEntryRepository extends JpaRepository<CrmEntry, Long> {
+    
+    // Query for onboarded companies (active registry entries)
+    // Includes: onboarded, on progress, Quote Sent
+    @Query("SELECT c FROM CrmEntry c WHERE LOWER(c.status) IN ('onboarded', 'on progress', 'quote sent')")
+    List<CrmEntry> findOnboardedEntries();
+    
+    // Query for completed companies
+    @Query("SELECT c FROM CrmEntry c WHERE LOWER(c.status) = 'completed'")
+    List<CrmEntry> findCompletedEntries();
+    
+    // Query for dropped companies
+    @Query("SELECT c FROM CrmEntry c WHERE LOWER(c.status) = 'drop'")
+    List<CrmEntry> findDroppedEntries();
 }
diff --git a/server/src/main/java/com/incial/crm/service/CrmService.java b/server/src/main/java/com/incial/crm/service/CrmService.java
@@ -29,6 +29,27 @@ public Map<String, List<CrmEntryDto>> getAllEntries() {
         return response;
     }
 
+    public List<CrmEntryDto> getOnboardedEntries() {
+        List<CrmEntry> entries = crmEntryRepository.findOnboardedEntries();
+        return entries.stream()
+                .map(this::convertToDto)
+                .collect(Collectors.toList());
+    }
+
+    public List<CrmEntryDto> getCompletedEntries() {
+        List<CrmEntry> entries = crmEntryRepository.findCompletedEntries();
+        return entries.stream()
+                .map(this::convertToDto)
+                .collect(Collectors.toList());
+    }
+
+    public List<CrmEntryDto> getDroppedEntries() {
+        List<CrmEntry> entries = crmEntryRepository.findDroppedEntries();
+        return entries.stream()
+                .map(this::convertToDto)
+                .collect(Collectors.toList());
+    }
+
     public CrmEntryDto createEntry(CrmEntryDto dto) {
         CrmEntry entry = convertToEntity(dto);
         CrmEntry saved = crmEntryRepository.save(entry);
