diff --git a/management/data/shared.py b/management/data/shared.py index 907df08815badd231178d3e300b229a52055dd6b..7d7248f3aba272704f4f7f4f9fdd181e99a7764b 100644 --- a/management/data/shared.py +++ b/management/data/shared.py @@ -132,9 +132,11 @@ class DataFactory(object): role.description = desc or f"{name.capitalize()}'s role" return role - def create_project(self, course, name, codename, config=None) -> Project: + def create_project(self, course, name=None, codename=None, config=None) -> Project: config = config or {} desc = name + "'s description" + name = name or codename + codename = codename or name project = self.__create_entity(Project, course=course, name=name, codename=codename, description=desc) project.set_config(**config) diff --git a/portal/config.py b/portal/config.py index 9d725820ea706703194e403120b922b358770101..e902dc1fe8f4bc89e96ac80b7367ad47971927e6 100644 --- a/portal/config.py +++ b/portal/config.py @@ -39,7 +39,8 @@ class Config(object): class DevelopmentConfig(Config): """Development configuration """ - SQLALCHEMY_DATABASE_URI = f"sqlite:///{paths.ROOT_DIR}/devel.db" + #SQLALCHEMY_DATABASE_URI = f"sqlite:///{paths.ROOT_DIR}/devel.db" + SQLALCHEMY_DATABASE_URI = f"postgresql://postgres:postgres@localhost:5432/postgres" SQLALCHEMY_TRACK_MODIFICATIONS = True PORTAL_ENV = 'dev' PORTAL_ADMIN_USER_PASSWORD = '789789' diff --git a/portal/rest/schemas.py b/portal/rest/schemas.py index a2638921ec1e4a4d37e03cf43acb50e5a8c9e799..f9ab58d375b8572b3a4f764632c96b152c9ef866 100644 --- a/portal/rest/schemas.py +++ b/portal/rest/schemas.py @@ -53,7 +53,9 @@ class NestedCollection: 'Course': ('id', 'codename'), 'User': ('id', 'username', 'uco'), 'Component': ('id', 'name', 'type'), - 'Submission': ('id', 'state', 'user.id', 'user.username'), + 'Submission': ('id', 'state', 'user.id', 'user.username', + 'project.id', 'project.codename', + 'project.course.id', 'project.course.codename'), 'ReviewItem': ('id', 'review.id', 'line', 'content', 'file', 'user.id'), }