resolved the merge conflict to integrate the changes

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,43 @@
+## Issue Title
+<!-- Provide a concise and descriptive title for the issue -->
+
+## Type
+<!-- Check the relevant options by putting an "x" in the brackets -->
+
+- [ ] Big
+- [ ] Feature Request
+- [ ] Info
+- [ ] Bug
+- [ ] Documentation
+- [ ] Other (please specify): 
+
+## Description
+<!-- Describe the issue in detail. What problem are you experiencing or what feature would you like to see added? -->
+
+## Expected Behavior
+
+<!-- Describe what you expected to happen when encountering the issue -->
+## Current Behavior
+
+<!-- Describe what is currently happening due to the issue -->
+
+## Steps to Reproduce
+<!-- If applicable, provide a step-by-step guide to reproducing the issue -->
+1. 
+2. 
+3. 
+
+## Screenshots / Code Snippets (if applicable)
+<!-- Include any relevant screenshots or code snippets that can help understand the issue better -->
+
+## Environment
+<!-- Provide details about your environment -->
+- Operating System: 
+- Browser (if applicable): 
+- Version/Commit ID (if applicable): 
+
+## Possible Solution (if you have any in mind)
+<!-- If you have an idea about how to fix the issue, please share it here -->
+
+## Additional Information
+<!-- Add any other information about the issue that you think might be helpful -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,32 @@
+## Description
+
+Please include a summary of the changes and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
+
+Fixes # (issue)
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] This change requires a documentation update
+
+## How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+
+- [ ] Test A
+- [ ] Test B
+
+## Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] New and existing unit tests pass locally with my changes
+- [ ] Any dependent changes have been merged and published in downstream modules

API/route.py

@@ -246,6 +246,16 @@ async def delete_employees(EmployeeCode: int):
     """
     Delete an employee from the collection based on the provided EmployeeCode.
 
+    Args:
+        EmployeeCode (int): The unique code of the employee to be deleted.
+
+    Returns:
+        dict: A dictionary containing a success message.
+
+    """
+    """
+    Delete an employee from the collection based on the provided EmployeeCode.
+
     Args:
         EmployeeCode (int): The unique code of the employee to be deleted.
 

CHANGELOG.md

@@ -24,4 +24,13 @@
 
 ### Changed
 - Modified the `UpdateEmployee` models in [`route.py`](route/route.py) to include a list of images instead of a single image.
-- Adjusted the mock data and assertions for update data in [`test_face_cycle.py`](testing/test_face_cycle.py) to handle multiple images for each employee.
+- Adjusted the mock data and assertions for update data in [`test_face_cycle.py`](testing/test_face_cycle.py) to handle multiple images for each employee.
+
+## [0.1.2] - 2024-03-09 - 22:00
+
+### Changed
+- Merged code in [`route.py`](route/route.py) and [`test_face_cycle.py`](testing/test_face_cycle.py) to improve code organization and readability. Changes made by @Devasy23.
+- Split `test_face_lifecycle` function in [`test_face_cycle.py`](testing/test_face_cycle.py) into multiple smaller test cases that execute in a particularly specified order. Changes made by @Devasy23.
+
+### Fixed
+- Resolved issues in the test cases of [`test_face_cycle.py`](testing/test_face_cycle.py) to ensure they pass with the updated code structure. Fixes made by @Devasy23.

testing/test_face_cycle.py

@@ -62,7 +62,7 @@ def test_face_lifecycle(
             "Name": "test",
             "gender": "Female",
             "Department": "IT",
-            "Images": [encoded_string2],
+            "Images": [encoded_string2, encoded_string2],
         },
     )
     assert response2.status_code == 200