Skip to content

Commit 42b7fd1

Browse files
committed
Revert "Add create-by audit for scenario creation"
This reverts commit 54d6464. Sorry I commit to the wrong branch
1 parent 54d6464 commit 42b7fd1

File tree

5 files changed

+5
-16
lines changed

5 files changed

+5
-16
lines changed

api/src/api/app/apis/scenarios_api.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,10 @@
4141
response_model_by_alias=True,
4242
)
4343
async def create_scenario(
44-
request: Request,
4544
scenario: Scenario = Body(None, description="")
4645
) -> ID:
4746
"""Create a new scenario to be simulated."""
48-
return await controller.create_scenario(
49-
scenario,
50-
request.state.user.userId if request.state.user else None,
51-
request.state.realm if request.state.realm else None
52-
)
47+
return await controller.create_scenario(scenario)
5348

5449

5550
@router.delete(

api/src/api/app/controller/scenario_controller.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,15 @@ class LookupObject:
5858
}
5959

6060
class ScenarioController:
61+
6162
async def create_scenario(
6263
self,
6364
scenario: Optional[Scenario],
64-
userId: Optional[str],
65-
orgId: Optional[str]
6665
) -> ID:
6766
"""Create a new scenario to be simulated."""
6867
if not scenario:
6968
raise HTTPException(status_code=500, detail="No scenario provided")
70-
return scenario_create(scenario, userId, orgId)
69+
return scenario_create(scenario)
7170

7271

7372
async def delete_scenario(

api/src/api/app/db/models.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ class Scenario(SQLModel, table=True):
2727

2828
timestampSubmitted: Optional[datetime] = Field(default=None, nullable=True)
2929
timestampSimulated: Optional[datetime] = Field(default=None, nullable=True)
30-
31-
userId: Optional[str] = Field(default=None, nullable=True) # Created by user
32-
orgId: Optional[str] = Field(default=None, nullable=True) # Created by user's LHA/Organization
30+
3331

3432
class ParameterDefinition(SQLModel, table=True):
3533
id: Optional[uuid.UUID] = Field(default_factory=uuid.uuid4, primary_key=True, nullable=False)

api/src/api/app/db/tasks.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ def parameter_definition_delete(id: StrictStr) -> None:
412412

413413

414414
## Scenarios ##
415-
def scenario_create(scenario: Scenario, userId: Optional[str], orgId: Optional[str]) -> ID:
415+
def scenario_create(scenario: Scenario) -> ID:
416416
scenario_obj = db.Scenario(
417417
name=scenario.name,
418418
description=scenario.description,
@@ -423,8 +423,6 @@ def scenario_create(scenario: Scenario, userId: Optional[str], orgId: Optional[s
423423
percentiles=','.join([str(perc) for perc in scenario.percentiles]) if scenario.percentiles else '50',
424424
timestampSubmitted=datetime.now(),
425425
timestampSimulated=None,
426-
userId=userId,
427-
orgId=orgId
428426
)
429427
with next(get_session()) as session:
430428
nested_dict = lambda: defaultdict(nested_dict)

api/src/api/app/middlewares/authentication_middleware.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ async def dispatch(self, request, call_next):
2222
# async def get_user(request: Request):
2323
# return request.state.user
2424
request.state.user = user
25-
request.state.realm = realm
2625

2726
# (Optional) role check can be added
2827
# if ['admin'] not in user.role:

0 commit comments

Comments
 (0)