Skip to content

Commit fc2d577

Browse files
committed
@GitHK review: drop id col
1 parent e00e015 commit fc2d577

File tree

4 files changed

+4
-17
lines changed

4 files changed

+4
-17
lines changed

packages/postgres-database/src/simcore_postgres_database/migration/versions/48604dfdc5f4_new_projects_to_job_map.py

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ def upgrade():
2020
# ### commands auto generated by Alembic - please adjust! ###
2121
op.create_table(
2222
"projects_to_jobs",
23-
sa.Column("id", sa.BigInteger(), autoincrement=True, nullable=False),
2423
sa.Column("project_uuid", sa.String(), nullable=False),
2524
sa.Column(
2625
"job_parent_resource_name",

packages/postgres-database/src/simcore_postgres_database/models/projects_to_jobs.py

+1-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@
88
# Maps projects used as jobs in the public-api
99
"projects_to_jobs",
1010
metadata,
11-
sa.Column(
12-
"id",
13-
sa.BigInteger,
14-
primary_key=True,
15-
autoincrement=True,
16-
doc="Identifier index",
17-
),
1811
sa.Column(
1912
"project_uuid",
2013
sa.String,
@@ -35,6 +28,7 @@
3528
"the relative resource name is shelves/shelf1/jobs/job2, "
3629
"the parent resource name is shelves/shelf1.",
3730
),
31+
# Composite key (project_uuid, job_parent_resource_name) uniquely identifies very row
3832
sa.UniqueConstraint(
3933
"project_uuid",
4034
"job_parent_resource_name",

services/web/server/src/simcore_service_webserver/projects/_jobs_repository.py

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import logging
22

33
from models_library.projects import ProjectID
4-
from pydantic import PositiveInt
54
from simcore_postgres_database.models.projects_to_jobs import projects_to_jobs
65
from simcore_postgres_database.utils_repos import transaction_context
76
from sqlalchemy.dialects.postgresql import insert as pg_insert
@@ -20,7 +19,7 @@ async def set_project_as_job(
2019
*,
2120
project_uuid: ProjectID,
2221
job_parent_resource_name: str,
23-
) -> PositiveInt:
22+
) -> None:
2423
async with transaction_context(self.engine, connection) as conn:
2524
stmt = (
2625
pg_insert(projects_to_jobs)
@@ -32,10 +31,6 @@ async def set_project_as_job(
3231
index_elements=["project_uuid", "job_parent_resource_name"],
3332
set_={"job_parent_resource_name": job_parent_resource_name},
3433
)
35-
.returning(projects_to_jobs.c.id)
3634
)
3735

38-
result = await conn.execute(stmt)
39-
row = result.one()
40-
projects_to_jobs_id: PositiveInt = row.id
41-
return projects_to_jobs_id
36+
await conn.execute(stmt)

services/web/server/src/simcore_service_webserver/projects/_jobs_service.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ async def set_project_as_job(
4242

4343
repo = ProjectJobsRepository.create_from_app(app)
4444

45-
projects_to_jobs_id = await repo.set_project_as_job(
45+
await repo.set_project_as_job(
4646
project_uuid=project_uuid, job_parent_resource_name=job_parent_resource_name
4747
)
48-
assert projects_to_jobs_id # nosec

0 commit comments

Comments
 (0)