update

withinJoel · Aug 23, 2024 · 11831a1 · 11831a1
1 parent 9841f80
commit 11831a1
Show file tree

Hide file tree

Showing 15 changed files with 98 additions and 42 deletions.
diff --git a/build/classes/java/main/com/example/teamsync/controller/DepartmentController.class b/build/classes/java/main/com/example/teamsync/controller/DepartmentController.class
diff --git a/build/classes/java/main/com/example/teamsync/controller/EmployeeController.class b/build/classes/java/main/com/example/teamsync/controller/EmployeeController.class
diff --git a/build/classes/java/main/com/example/teamsync/repository/EmployeeRepository.class b/build/classes/java/main/com/example/teamsync/repository/EmployeeRepository.class
diff --git a/build/classes/java/main/com/example/teamsync/service/EmployeeService.class b/build/classes/java/main/com/example/teamsync/service/EmployeeService.class
diff --git a/build/resources/main/static/employees.html b/build/resources/main/static/employees.html
@@ -166,22 +166,36 @@ <h2 class="card-title">Employee List</h2>
     }
 
     function fetchDepartments() {
-        fetch(departmentApiUrl)
-            .then(response => response.json())
+        const apiKey = 'xyXfX4pzoBhJYIMygh1eu8qPvlp8dkBEjKRzzOK90yQYgV9W6jMrHBbDdyM2tPuT';
+
+        fetch(departmentApiUrl, {
+            method: 'GET',
+            headers: {
+                'API-Key': apiKey,
+                'Content-Type': 'application/json'
+            }
+        })
+            .then(response => {
+                if (!response.ok) {
+                    throw new Error('API key invalid or network response was not ok');
+                }
+                return response.json();
+            })
             .then(data => {
                 const select = document.getElementById('department-id');
                 select.innerHTML = '';
                 data.forEach(department => {
                     const option = document.createElement('option');
-                    for (let i = 0; i < 11; i++) {
-                        if (department.id = i){
-                            option.textContent = department.name;
-                            departmentNames.push(department.name);
-                        }
-                    }
+                    option.value = department.id;
+                    option.textContent = department.name;
                     select.appendChild(option);
+                    departmentNames.push(department.name);
                 });
                 M.FormSelect.init(select); // Initialize Materialize select component
+            })
+            .catch(error => {
+                console.error('Error:', error);
+                // Handle the error appropriately in your UI
             });
     }
 

diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/DepartmentController.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/DepartmentController.class.uniqueId1
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/EmployeeController.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/EmployeeController.class.uniqueId0
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/EmployeeResource.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/EmployeeResource.class.uniqueId1
diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/EmployeeResourceAssembler.class.uniqueId2 b/build/tmp/compileJava/compileTransaction/stash-dir/EmployeeResourceAssembler.class.uniqueId2
diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/src/main/java/com/example/teamsync/controller/DepartmentController.java b/src/main/java/com/example/teamsync/controller/DepartmentController.java
@@ -2,6 +2,7 @@
 
 import com.example.teamsync.controller.dto.DepartmentDto;
 import com.example.teamsync.service.DepartmentService;
+import com.example.teamsync.service.EmployeeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -15,31 +16,50 @@ public class DepartmentController {
     @Autowired
     private DepartmentService departmentService;
 
+    @Autowired
+    private EmployeeService employeeService;
+
     @GetMapping
-    public List<DepartmentDto> getAllDepartments() {
-        return departmentService.getAllDepartments();
+    public ResponseEntity<?> getAllDepartments() {
+            return ResponseEntity.ok(departmentService.getAllDepartments());
     }
 
     @GetMapping("/{id}")
-    public ResponseEntity<DepartmentDto> getDepartmentById(@PathVariable Long id) {
-        return departmentService.getDepartmentById(id)
-                .map(department -> ResponseEntity.ok(departmentService.convertToDto(department)))
-                .orElse(ResponseEntity.notFound().build());
+    public ResponseEntity<?> getDepartmentById(@PathVariable Long id, @RequestHeader("API-Key") String apiKey) {
+        if (isValidApiKey(apiKey)) {
+            return departmentService.getDepartmentById(id)
+                    .map(department -> ResponseEntity.ok(departmentService.convertToDto(department)))
+                    .orElse(ResponseEntity.notFound().build());
+        }
+        return ResponseEntity.status(401).body("Invalid API Key");
     }
 
     @PostMapping
-    public DepartmentDto createDepartment(@RequestBody DepartmentDto departmentDto) {
-        return departmentService.createDepartment(departmentDto);
+    public ResponseEntity<?> createDepartment(@RequestBody DepartmentDto departmentDto, @RequestHeader("API-Key") String apiKey) {
+        if (isValidApiKey(apiKey)) {
+            return ResponseEntity.ok(departmentService.createDepartment(departmentDto));
+        }
+        return ResponseEntity.status(401).body("Invalid API Key");
     }
 
     @PutMapping("/{id}")
-    public ResponseEntity<DepartmentDto> updateDepartment(@PathVariable Long id, @RequestBody DepartmentDto departmentDto) {
-        return ResponseEntity.ok(departmentService.updateDepartment(id, departmentDto));
+    public ResponseEntity<?> updateDepartment(@PathVariable Long id, @RequestBody DepartmentDto departmentDto, @RequestHeader("API-Key") String apiKey) {
+        if (isValidApiKey(apiKey)) {
+            return ResponseEntity.ok(departmentService.updateDepartment(id, departmentDto));
+        }
+        return ResponseEntity.status(401).body("Invalid API Key");
     }
 
     @DeleteMapping("/{id}")
-    public ResponseEntity<Void> deleteDepartment(@PathVariable Long id) {
-        departmentService.deleteDepartment(id);
-        return ResponseEntity.noContent().build();
+    public ResponseEntity<?> deleteDepartment(@PathVariable Long id, @RequestHeader("API-Key") String apiKey) {
+        if (isValidApiKey(apiKey)) {
+            departmentService.deleteDepartment(id);
+            return ResponseEntity.noContent().build();
+        }
+        return ResponseEntity.status(401).body("Invalid API Key");
+    }
+
+    private boolean isValidApiKey(String apiKey) {
+        return employeeService.isValidToken(apiKey);
     }
 }
diff --git a/src/main/java/com/example/teamsync/controller/EmployeeController.java b/src/main/java/com/example/teamsync/controller/EmployeeController.java
@@ -13,7 +13,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 import java.util.stream.Collectors;
 
 @RestController
@@ -27,20 +26,23 @@ public class EmployeeController {
     private EmployeeResourceAssembler assembler;
 
     @GetMapping
-    public ResponseEntity<?> getAllEmployees() {
-        try {
-            List<Employee> employees = employeeService.getAllEmployees();
-            List<EmployeeResource> employeeResources = employees.stream()
-                    .map(assembler::toModel)
-                    .collect(Collectors.toList());
+    public ResponseEntity<?> getAllEmployees(@RequestHeader("API-Key") String apiKey) {
+        if (employeeService.isValidToken(apiKey)){
+            try {
+                List<Employee> employees = employeeService.getAllEmployees();
+                List<EmployeeResource> employeeResources = employees.stream()
+                        .map(assembler::toModel)
+                        .collect(Collectors.toList());
 
-            return ResponseEntity.ok(employeeResources);
-        } catch (Exception e) {
-            Map<String, String> errorResponse = new HashMap<>();
-            errorResponse.put("error", "An error occurred while fetching employees.");
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(errorResponse);
+                return ResponseEntity.ok(employeeResources);
+            } catch (Exception e) {
+                Map<String, String> errorResponse = new HashMap<>();
+                errorResponse.put("error", "An error occurred while fetching employees.");
+                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                        .body(errorResponse);
+            }
         }
+        return ResponseEntity.status(401).body("Invalid API Key");
     }
 
     @GetMapping("/{id}")

diff --git a/src/main/java/com/example/teamsync/repository/EmployeeRepository.java b/src/main/java/com/example/teamsync/repository/EmployeeRepository.java
@@ -4,4 +4,5 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface EmployeeRepository extends JpaRepository<Employee, Long> {
+    boolean existsByToken(String token);
 }
diff --git a/src/main/java/com/example/teamsync/service/EmployeeService.java b/src/main/java/com/example/teamsync/service/EmployeeService.java
@@ -14,6 +14,11 @@ public class EmployeeService {
     @Autowired
     private EmployeeRepository employeeRepository;
 
+
+    public boolean isValidToken(String token) {
+        return employeeRepository.existsByToken(token);
+    }
+
     // Retrieve all employees
     public List<Employee> getAllEmployees() {
         return employeeRepository.findAll();

diff --git a/src/main/resources/static/employees.html b/src/main/resources/static/employees.html
@@ -166,22 +166,36 @@ <h2 class="card-title">Employee List</h2>
     }
 
     function fetchDepartments() {
-        fetch(departmentApiUrl)
-            .then(response => response.json())
+        const apiKey = 'xyXfX4pzoBhJYIMygh1eu8qPvlp8dkBEjKRzzOK90yQYgV9W6jMrHBbDdyM2tPuT';
+
+        fetch(departmentApiUrl, {
+            method: 'GET',
+            headers: {
+                'API-Key': apiKey,
+                'Content-Type': 'application/json'
+            }
+        })
+            .then(response => {
+                if (!response.ok) {
+                    throw new Error('API key invalid or network response was not ok');
+                }
+                return response.json();
+            })
             .then(data => {
                 const select = document.getElementById('department-id');
                 select.innerHTML = '';
                 data.forEach(department => {
                     const option = document.createElement('option');
-                    for (let i = 0; i < 11; i++) {
-                        if (department.id = i){
-                            option.textContent = department.name;
-                            departmentNames.push(department.name);
-                        }
-                    }
+                    option.value = department.id;
+                    option.textContent = department.name;
                     select.appendChild(option);
+                    departmentNames.push(department.name);
                 });
                 M.FormSelect.init(select); // Initialize Materialize select component
+            })
+            .catch(error => {
+                console.error('Error:', error);
+                // Handle the error appropriately in your UI
             });
     }