Resolved conflicts

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

@@ -0,0 +1,38 @@
+package net.gepafin.tendermanagement.service.impl;
+
+import jakarta.servlet.http.HttpServletRequest;
+import net.gepafin.tendermanagement.dao.UserActionDao;
+import net.gepafin.tendermanagement.entities.UserEntity;
+import net.gepafin.tendermanagement.enums.TimePeriodEnum;
+import net.gepafin.tendermanagement.enums.UserActionContextEnum;
+import net.gepafin.tendermanagement.model.response.ActionContextLabelResponse;
+import net.gepafin.tendermanagement.model.response.SummaryPageResponseBean;
+import net.gepafin.tendermanagement.service.UserActionService;
+import net.gepafin.tendermanagement.util.Validator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class UserActionServiceImpl implements UserActionService {
+
+    @Autowired
+    private UserActionDao userActionDao;
+
+    @Autowired
+    private Validator validator;
+
+
+    @Override
+    public SummaryPageResponseBean getUserAction(HttpServletRequest request, Long userId, TimePeriodEnum timeFilter, List<UserActionContextEnum> actionContext) {
+        UserEntity user  = validator.validateUserId(request, userId);
+        return userActionDao.getUserAction(request,user,timeFilter,actionContext);
+    }
+
+    @Override
+    public List<ActionContextLabelResponse> getActionContextLabels(HttpServletRequest request, Long userId) {
+        UserEntity user = validator.validateUserId(request, userId);
+        return userActionDao.getActionContextLabels(request,user);
+    }
+}