renamed model files to singular (#64)

* renamed model files to singular

* Fix #63 refactored with singulare module file names

* resolved incorrect imports

backend/project/endpoints/courses/course_admin_relation.py

@@ -10,8 +10,8 @@
 from flask import request
 from flask_restful import Resource
 
-from project.models.course_relations import CourseAdmin
-from project.models.users import User
+from project.models.course_relation import CourseAdmin
+from project.models.user import User
 from project.endpoints.courses.courses_utils import (
     execute_query_abort_if_db_error,
     commit_abort_if_error,

backend/project/endpoints/courses/course_details.py

@@ -14,8 +14,8 @@
 from flask_restful import Resource
 from sqlalchemy.exc import SQLAlchemyError
 
-from project.models.courses import Course
-from project.models.course_relations import CourseAdmin, CourseStudent
+from project.models.course import Course
+from project.models.course_relation import CourseAdmin, CourseStudent
 
 from project import db
 from project.utils.query_agent import delete_by_id_from_model, patch_by_id_from_model

backend/project/endpoints/courses/course_student_relation.py

@@ -14,7 +14,7 @@
 from flask_restful import Resource
 
 from project import db
-from project.models.course_relations import CourseStudent
+from project.models.course_relation import CourseStudent
 from project.endpoints.courses.courses_utils import (
     execute_query_abort_if_db_error,
     add_abort_if_error,

backend/project/endpoints/courses/courses.py

@@ -12,7 +12,7 @@
 from flask import request
 from flask_restful import Resource
 
-from project.models.courses import Course
+from project.models.course import Course
 from project.utils.query_agent import query_selected_from_model, insert_into_model
 
 load_dotenv()

backend/project/endpoints/courses/courses_utils.py

@@ -11,9 +11,9 @@
 from sqlalchemy.exc import SQLAlchemyError
 
 from project import db
-from project.models.course_relations import CourseAdmin
-from project.models.users import User
-from project.models.courses import Course
+from project.models.course_relation import CourseAdmin
+from project.models.user import User
+from project.models.course import Course
 
 load_dotenv()
 API_URL = getenv("API_HOST")

backend/project/endpoints/projects/project_detail.py

@@ -9,7 +9,7 @@
 from flask import request
 from flask_restful import Resource
 
-from project.models.projects import Project
+from project.models.project import Project
 from project.utils.query_agent import query_by_id_from_model, delete_by_id_from_model, \
     patch_by_id_from_model
 

backend/project/endpoints/projects/projects.py

@@ -7,7 +7,7 @@
 from flask import request
 from flask_restful import Resource
 
-from project.models.projects import Project
+from project.models.project import Project
 from project.utils.query_agent import query_selected_from_model, insert_into_model
 
 API_URL = getenv('API_HOST')

backend/project/endpoints/users.py

@@ -7,7 +7,7 @@
 from sqlalchemy.exc import SQLAlchemyError
 
 from project import db
-from project.models.users import User as userModel
+from project.models.user import User as userModel
 
 users_bp = Blueprint("users", __name__)
 users_api = Api(users_bp)

backend/tests/endpoints/conftest.py

@@ -3,10 +3,10 @@
 
 import os
 import pytest
-from project.models.courses import Course
-from project.models.users import User
-from project.models.projects import Project
-from project.models.course_relations import CourseStudent,CourseAdmin
+from project.models.course import Course
+from project.models.user import User
+from project.models.project import Project
+from project.models.course_relation import CourseStudent,CourseAdmin
 from project import create_app_with_db, db
 from project.db_in import url
 

backend/tests/endpoints/courses_test.py

@@ -1,9 +1,9 @@
 """Here we will test all the courses endpoint related functionality"""
 
-from project.models.course_relations import CourseStudent, CourseAdmin
+from project.models.course_relation import CourseStudent, CourseAdmin
 
 
-from project.models.courses import Course
+from project.models.course import Course
 
 
 class TestCourseEndpoint:

backend/tests/endpoints/project_test.py

@@ -1,5 +1,5 @@
 """Tests for project endpoints."""
-from project.models.projects import Project
+from project.models.project import Project
 
 def test_projects_home(client):
     """Test home project endpoint."""

backend/tests/endpoints/user_test.py

@@ -10,7 +10,7 @@
 import pytest
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy import create_engine
-from project.models.users import User
+from project.models.user import User
 from project import db
 from tests import db_url
 

backend/tests/models/conftest.py

@@ -6,10 +6,10 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 import pytest
-from project.models.courses import Course
-from project.models.course_relations import CourseAdmin, CourseStudent
-from project.models.projects import Project
-from project.models.users import User
+from project.models.course import Course
+from project.models.course_relation import CourseAdmin, CourseStudent
+from project.models.project import Project
+from project.models.user import User
 from project.db_in import url
 
 engine = create_engine(url)

backend/tests/models/course_test.py

@@ -1,9 +1,9 @@
 """Test module for the Course model"""
 import pytest
 from sqlalchemy.exc import IntegrityError
-from project.models.courses import Course
-from project.models.users import User
-from project.models.course_relations import CourseAdmin, CourseStudent
+from project.models.course import Course
+from project.models.user import User
+from project.models.course_relation import CourseAdmin, CourseStudent
 
 
 class TestCourseModel:

backend/tests/models/projects_and_submissions_test.py

@@ -2,8 +2,8 @@
 from datetime import datetime
 import pytest
 from sqlalchemy.exc import IntegrityError
-from project.models.projects import Project
-from project.models.submissions import Submission
+from project.models.project import Project
+from project.models.submission import Submission
 
 class TestProjectAndSubmissionModel: # pylint: disable=too-few-public-methods
     """Test class for the database models of projects and submissions"""

backend/tests/models/users_test.py

@@ -1,7 +1,7 @@
 """
 This file contains the tests for the User model.
 """
-from project.models.users import User
+from project.models.user import User
 
 
 class TestUserModel: