resolved conflicts

src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java

@@ -223,5 +223,8 @@ public class GepafinConstant {
 	public static final String APPLICATION_SIGNED_DOCUMENT_NOT_FOUND = "application.signed.document.not.found";
 	public static final String DELETE_SIGNED_DOCUMENT_FILE_SUCCESS = "delete.signed.document.file.success";
     public static final String DD_MM_YYYY = "dd/MM/yyyy";
+
+    public static final String DASHBOARD_WIDGET_FETCHED_SUCCESSFULLY="dashboard.widget.fetched.successfully";
+
 }
 

src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java

@@ -0,0 +1,118 @@
+package net.gepafin.tendermanagement.dao;
+
+import net.gepafin.tendermanagement.entities.CompanyEntity;
+import net.gepafin.tendermanagement.entities.UserEntity;
+import net.gepafin.tendermanagement.enums.CallStatusEnum;
+import net.gepafin.tendermanagement.enums.RoleStatusEnum;
+import net.gepafin.tendermanagement.enums.UserStatusEnum;
+import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
+import net.gepafin.tendermanagement.model.response.Widget1;
+import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
+import net.gepafin.tendermanagement.repositories.ApplicationRepository;
+import net.gepafin.tendermanagement.repositories.CallRepository;
+import net.gepafin.tendermanagement.repositories.CompanyRepository;
+import net.gepafin.tendermanagement.repositories.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+
+@Component
+public class DashboardDao {
+
+	@Autowired
+	private CallRepository callRepository;
+
+	@Autowired
+	private UserRepository userRepository;
+
+	@Autowired
+	private ApplicationRepository applicationRepository;
+
+	@Autowired
+	private CompanyRepository companyRepository;
+
+	public SuperAdminWidgetResponseBean getDashboardWidget() {
+		SuperAdminWidgetResponseBean widgetResponseBean = new SuperAdminWidgetResponseBean();
+		widgetResponseBean.setWidget1(createWidget1());
+//        List<Object[]> widgetBars = callRepository.findApplicationsPerCall();
+//        widgetResponseBean.setWidgetBars(widgetBars);
+		return widgetResponseBean;
+	}
+
+	private Widget1 createWidget1() {
+		Widget1 widget1 = initializeWidget1();
+
+		setActiveCalls(widget1);
+		setRegisteredUsers(widget1);
+		setTotalActiveFinancing(widget1);
+		setSubmittedApplications(widget1);
+		setDraftApplications(widget1);
+		setNumberOfCompanies(widget1);
+
+		return widget1;
+	}
+
+	private Widget1 initializeWidget1() {
+		return Widget1.builder().numberOfActiveCalls(0L).numberOfCompany(0L).numberOfDraftApplications(0L)
+				.numberOfResgisteredUsers(0L).numberOfSubmittedApplications(0L).totalActiveFinancing(BigDecimal.ZERO)
+				.build();
+	}
+
+	private void setActiveCalls(Widget1 widget1) {
+		Long activeCalls = callRepository.countByStatus(CallStatusEnum.PUBLISH.getValue());
+		if (activeCalls != null) {
+			widget1.setNumberOfActiveCalls(activeCalls);
+		}
+	}
+
+	private void setRegisteredUsers(Widget1 widget1) {
+		Long activeUsers = userRepository.countByStatusAndRoleEntity_RoleType(UserStatusEnum.ACTIVE.getValue(),
+				RoleStatusEnum.ROLE_BENEFICIARY.getValue());
+		if (activeUsers != null) {
+			widget1.setNumberOfResgisteredUsers(activeUsers);
+		}
+	}
+
+	private void setTotalActiveFinancing(Widget1 widget1) {
+		BigDecimal totalActiveFinancing = callRepository.findTotalAmountOfPublishedCalls();
+		widget1.setTotalActiveFinancing(totalActiveFinancing);
+	}
+
+	private void setSubmittedApplications(Widget1 widget1) {
+		Long submittedApplications = applicationRepository.countSubmittedApplications();
+		if (submittedApplications != null) {
+			widget1.setNumberOfSubmittedApplications(submittedApplications);
+		}
+	}
+
+	private void setDraftApplications(Widget1 widget1) {
+		Long draftApplications = applicationRepository.countDraftApplications();
+		if (draftApplications != null) {
+			widget1.setNumberOfDraftApplications(draftApplications);
+		}
+	}
+
+	private void setNumberOfCompanies(Widget1 widget1) {
+		Long numberOfCompanies = companyRepository.countTotalCompanies();
+		if (numberOfCompanies != null) {
+			widget1.setNumberOfCompany(numberOfCompanies);
+		}
+	}
+
+	public BeneficiaryWidgetResponseBean getDashboardWidgetForBeneficiary(UserEntity userEntity,
+			CompanyEntity company) {
+		BeneficiaryWidgetResponseBean beneficiaryWidgetResponseBean = BeneficiaryWidgetResponseBean.builder()
+				.numberOfApplications(0L).numberOfCalls(0L).numberOfIntegratedDocuments(0L).build();
+		Long activeCalls = callRepository.countByStatus(CallStatusEnum.PUBLISH.getValue());
+		if (activeCalls != null) {
+			beneficiaryWidgetResponseBean.setNumberOfCalls(activeCalls);
+		}
+		Long activeApplication = applicationRepository.countSubmittedApplicationsByUserId(userEntity.getId(),
+				company.getId());
+		if (activeApplication != null) {
+			beneficiaryWidgetResponseBean.setNumberOfApplications(activeApplication);
+		}
+		return beneficiaryWidgetResponseBean;
+	}
+}

src/main/java/net/gepafin/tendermanagement/model/response/BeneficiaryWidgetResponseBean.java

@@ -0,0 +1,17 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class BeneficiaryWidgetResponseBean {
+
+    private Long numberOfApplications;
+
+    private Long numberOfCalls;
+
+    private Long numberOfIntegratedDocuments;
+
+
+}

src/main/java/net/gepafin/tendermanagement/model/response/SuperAdminWidgetResponseBean.java

@@ -0,0 +1,14 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SuperAdminWidgetResponseBean {
+
+    private  Widget1 widget1;
+
+//    private List<Object[]> widgetBars;
+
+}

src/main/java/net/gepafin/tendermanagement/model/response/Widget1.java

@@ -0,0 +1,26 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Builder
+public class Widget1 {
+
+    private Long numberOfActiveCalls;
+
+    private Long numberOfResgisteredUsers;
+
+//    private Long preInvestigationQuestions;
+
+    private Long numberOfSubmittedApplications;
+
+    private Long numberOfDraftApplications;
+
+    private Long numberOfCompany;
+
+    private BigDecimal totalActiveFinancing;
+
+}

src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java

@@ -29,4 +29,15 @@ public interface ApplicationRepository extends JpaRepository<ApplicationEntity,
 	public Optional<ApplicationEntity> findByIdAndUserIdAndCallIdAndIsDeletedFalse(Long applicationId, Long userId,
 			Long callId);
 
+	@Query("SELECT COUNT(a) FROM ApplicationEntity a WHERE a.userId = :userId AND a.company.id = :companyId AND a.status = 'SUBMIT' ")
+	Long countSubmittedApplicationsByUserId(@Param("userId") Long userId, @Param("companyId") Long companyId);
+
+	@Query("SELECT COUNT(a) FROM ApplicationEntity a WHERE a.status = 'SUBMIT'")
+	Long countSubmittedApplications();
+
+	@Query("SELECT COUNT(a) FROM ApplicationEntity a WHERE a.status = 'DRAFT'")
+	Long countDraftApplications();
+
+
+
 }

src/main/java/net/gepafin/tendermanagement/repositories/CallRepository.java

@@ -2,8 +2,10 @@ package net.gepafin.tendermanagement.repositories;
 import net.gepafin.tendermanagement.entities.CallEntity;
 import net.gepafin.tendermanagement.enums.CallStatusEnum;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Repository
@@ -13,4 +15,14 @@ public interface CallRepository extends JpaRepository<CallEntity, Long> {
     List<CallEntity> findByStatusIn(List<String> callStatus);
 
   public  CallEntity findByIdAndStatus(Long id,String status);
+
+    public  Long countByStatus(String status);
+
+    @Query("SELECT COALESCE(SUM(c.amount), 0) FROM CallEntity c WHERE c.status = 'PUBLISH'")
+    BigDecimal findTotalAmountOfPublishedCalls();
+
+    @Query("SELECT c.name, COUNT(a.id) " +
+            "FROM CallEntity c LEFT JOIN ApplicationEntity a ON c.id = a.call.id " +
+            "GROUP BY c.name")
+    List<Object[]> findApplicationsPerCall();
 }

src/main/java/net/gepafin/tendermanagement/repositories/CompanyRepository.java

@@ -3,6 +3,7 @@ package net.gepafin.tendermanagement.repositories;
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import net.gepafin.tendermanagement.entities.CompanyEntity;
@@ -15,4 +16,8 @@ public interface CompanyRepository extends JpaRepository<CompanyEntity, Long> {
 	Boolean existsByVatNumber(String vatNumber);
 	CompanyEntity findByVatNumber(String vatNumber);
 
+	@Query("SELECT COUNT(c) FROM CompanyEntity c")
+	long countTotalCompanies();
+
+
 }

src/main/java/net/gepafin/tendermanagement/repositories/UserRepository.java

@@ -19,4 +19,7 @@ public interface UserRepository extends JpaRepository<UserEntity, Long> {
 
 	boolean existsByBeneficiaryCodiceFiscale(String codiceFiscale);
     UserEntity findByBeneficiaryId(Long beneficiaryId);
+
+    Long countByStatusAndRoleEntity_RoleType(String status, String roleName);
+
 }

src/main/java/net/gepafin/tendermanagement/service/DashboardService.java

@@ -0,0 +1,13 @@
+package net.gepafin.tendermanagement.service;
+
+import jakarta.servlet.http.HttpServletRequest;
+import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
+import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
+
+public interface DashboardService {
+
+    public SuperAdminWidgetResponseBean getDashboardWidgetForSuperAdmin(HttpServletRequest request);
+
+    public BeneficiaryWidgetResponseBean getDashboardWidgetForBeneficiary(HttpServletRequest request, Long companyId);
+
+}

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);
+    }
+}

src/main/java/net/gepafin/tendermanagement/web/rest/api/DashboardApi.java

@@ -0,0 +1,51 @@
+package net.gepafin.tendermanagement.web.rest.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.ExampleObject;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
+import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
+import net.gepafin.tendermanagement.model.util.Response;
+import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+public interface DashboardApi {
+
+    @Operation(summary = "Api to get dashboard widget for super admin",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "OK"),
+                    @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
+    @PostMapping(value = "",
+            produces = { "application/json" })
+    @PreAuthorize("hasRole('ROLE_SUPER_ADMIN')")
+    ResponseEntity<Response<SuperAdminWidgetResponseBean>> getDashboardWidgetForSuperAdmin(HttpServletRequest request);
+
+    @Operation(summary = "Api to get dashboard widget for beneficiary",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "OK"),
+                    @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
+    @PostMapping(value = "/beneficiary/company/{companyId}",
+            produces = { "application/json" })
+    ResponseEntity<Response<BeneficiaryWidgetResponseBean>> getDashboardWidgetForBeneficiary(HttpServletRequest request,
+    		@Parameter(description = "The company id", required = true) @PathVariable(value = "companyId", required = true) Long companyId);
+    
+
+
+}

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/DashboardApiController.java

@@ -0,0 +1,38 @@
+package net.gepafin.tendermanagement.web.rest.api.impl;
+
+import jakarta.servlet.http.HttpServletRequest;
+import net.gepafin.tendermanagement.config.Translator;
+import net.gepafin.tendermanagement.constants.GepafinConstant;
+import net.gepafin.tendermanagement.model.response.BeneficiaryWidgetResponseBean;
+import net.gepafin.tendermanagement.model.response.SuperAdminWidgetResponseBean;
+import net.gepafin.tendermanagement.model.util.Response;
+import net.gepafin.tendermanagement.service.DashboardService;
+import net.gepafin.tendermanagement.web.rest.api.DashboardApi;
+import net.gepafin.tendermanagement.web.rest.api.errors.Status;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("${openapi.gepafin.base-path:/v1/dashboard}")
+public class DashboardApiController implements DashboardApi {
+
+    @Autowired
+    private DashboardService dashboardService;
+
+    @Override
+    public ResponseEntity<Response<SuperAdminWidgetResponseBean>> getDashboardWidgetForSuperAdmin(HttpServletRequest request) {
+        SuperAdminWidgetResponseBean widgetResponseBean= dashboardService.getDashboardWidgetForSuperAdmin(request);
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(new Response<>(widgetResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.DASHBOARD_WIDGET_FETCHED_SUCCESSFULLY)));    }
+
+    @Override
+    public ResponseEntity<Response<BeneficiaryWidgetResponseBean>> getDashboardWidgetForBeneficiary(HttpServletRequest request, Long companyId) {
+        BeneficiaryWidgetResponseBean widgetResponseBean= dashboardService.getDashboardWidgetForBeneficiary(request, companyId);
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(new Response<>(widgetResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.DASHBOARD_WIDGET_FETCHED_SUCCESSFULLY)));
+    }
+
+}

src/main/resources/application.properties

@@ -4,7 +4,7 @@ spring.application.name=tendermanagement
 spring.servlet.multipart.max-file-size=15MB
 spring.servlet.multipart.max-request-size=15MB
 
-spring.profiles.active=testing
+spring.profiles.active=local
 
 
 # JPA Configuration

src/main/resources/message_en.properties

@@ -247,4 +247,6 @@ get.signed.document.file.success=Signed document file retrieved successfully.
 application.signed.document.not.found=Signed document for the application not found.
 delete.signed.document.file.success=Signed document deleted successfully.
 
+dashboard.widget.fetched.successfully=Dasboard widget fetched sucessfully.
+
 

src/main/resources/message_it.properties

@@ -243,4 +243,5 @@ get.signed.document.file.success=File del documento firmato recuperato con succe
 application.signed.document.not.found=Documento firmato per l'applicazione non trovato.
 delete.signed.document.file.success=Documento firmato eliminato con successo.
 
+dashboard.widget.fetched.successfully=Widget dashboard recuperato correttamente.