resolved conflicts

src/main/java/net/gepafin/tendermanagement/service/impl/DashboardServiceImpl.java

@@ -0,0 +1,34 @@
+package net.gepafin.tendermanagement.service.impl;
+
+import jakarta.servlet.http.HttpServletRequest;
+import net.gepafin.tendermanagement.dao.DashboardDao;
+import net.gepafin.tendermanagement.entities.CompanyEntity;
+import net.gepafin.tendermanagement.entities.UserEntity;
+import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
+import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
+import net.gepafin.tendermanagement.service.DashboardService;
+import net.gepafin.tendermanagement.util.Validator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DashboardServiceImpl implements DashboardService {
+
+    @Autowired
+    private DashboardDao dashboardDao;
+
+    @Autowired
+    private Validator validator;
+
+    @Override
+    public SuperAdminWidgetResponseBean getDashboardWidgetForSuperAdmin(HttpServletRequest request) {
+        return dashboardDao.getDashboardWidget();
+    }
+
+    @Override
+    public BeneficiaryWidgetResponseBean getDashboardWidgetForBeneficiary(HttpServletRequest request, Long companyId) {
+        UserEntity userEntity=validator.validateUser(request);
+        CompanyEntity company = validator.validateUserWithCompany(request, companyId);
+        return   dashboardDao.getDashboardWidgetForBeneficiary(userEntity, company);
+    }
+}