Position and Salary

src/main/java/com/ffii/tsms/modules/data/entity/PositionRepository.java

@@ -7,5 +7,5 @@ import java.util.List;
 
 public interface PositionRepository extends AbstractRepository<Position, Long> {
 
-    List<PositionSearchInfo> findPositionSearchInfoBy();
+    List<PositionSearchInfo> findPositionSearchInfoByDeletedFalse();
 }

src/main/java/com/ffii/tsms/modules/data/entity/SalaryRepository.java

@@ -1,6 +1,10 @@
 package com.ffii.tsms.modules.data.entity;
 
 import com.ffii.core.support.AbstractRepository;
+import com.ffii.tsms.modules.data.entity.projections.SalarySearchInfo;
+
+import java.util.List;
 
 public interface SalaryRepository extends AbstractRepository<Salary, Long> {
+    List<SalarySearchInfo> findSalarySearchInfoBy();
 }

src/main/java/com/ffii/tsms/modules/data/entity/projections/SalarySearchInfo.java

@@ -0,0 +1,11 @@
+package com.ffii.tsms.modules.data.entity.projections;
+
+/**
+ * Projection for {@link com.ffii.tsms.modules.data.entity.Salary}
+ */
+public interface SalarySearchInfo {
+    Integer getSalaryPoint();
+    Integer getLowerLimit();
+    Integer getUpperLimit();
+
+}

src/main/java/com/ffii/tsms/modules/data/service/PositionService.kt

@@ -1,5 +1,6 @@
 package com.ffii.tsms.modules.data.service
 
+import com.ffii.core.support.JdbcDao
 import com.ffii.tsms.modules.data.entity.CompanyRepository
 import com.ffii.tsms.modules.data.entity.Department
 import com.ffii.tsms.modules.data.entity.DepartmentRepository
@@ -13,10 +14,11 @@ import com.ffii.tsms.modules.data.web.models.NewPositionRequest
 import org.springframework.stereotype.Service
 @Service
 class PositionService(
-    private val positionRepository: PositionRepository
+    private val positionRepository: PositionRepository,
+    private val jdbcDao: JdbcDao
 ) {
     fun allPositions(): List<PositionSearchInfo>{
-        return positionRepository.findPositionSearchInfoBy()
+        return positionRepository.findPositionSearchInfoByDeletedFalse()
     }
 
     fun savePosition(request: NewPositionRequest): Position {
@@ -26,7 +28,6 @@ class PositionService(
                 code = request.positionCode
                 description = request.description
             }
-
         return positionRepository.save(position)
     }
 }

src/main/java/com/ffii/tsms/modules/data/service/SalaryService.kt

@@ -0,0 +1,18 @@
+package com.ffii.tsms.modules.data.service
+
+import com.ffii.core.support.JdbcDao
+import com.ffii.tsms.modules.data.entity.Salary
+import com.ffii.tsms.modules.data.entity.SalaryRepository
+import com.ffii.tsms.modules.data.entity.projections.SalarySearchInfo
+import org.springframework.stereotype.Service
+
+@Service
+class SalaryService(
+    private val salaryRepository: SalaryRepository,
+    private val jdbcDao: JdbcDao
+) {
+
+    fun allSalary(): List<SalarySearchInfo>{
+        return salaryRepository.findSalarySearchInfoBy()
+    }
+}

src/main/java/com/ffii/tsms/modules/data/web/SalaryController.kt

@@ -0,0 +1,17 @@
+package com.ffii.tsms.modules.data.web.models
+
+import com.ffii.tsms.modules.data.entity.projections.SalarySearchInfo
+import com.ffii.tsms.modules.data.service.SalaryService
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+@RequestMapping("/salarys")
+class SalaryController(private val salaryService: SalaryService) {
+    @GetMapping
+    fun allSalarys(): List<SalarySearchInfo>{
+        return salaryService.allSalary()
+    }
+}