Skip to content

Commit

Permalink
Fix linting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jadmsaadaot committed Nov 1, 2024
1 parent 5b04c24 commit 2cc74fe
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion submit-api/src/submit_api/models/account_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
from sqlalchemy import Column, ForeignKey
from sqlalchemy.orm import column_property

from .user import User as UserModel
from .base_model import BaseModel
from .db import db
from .user import User as UserModel


class AccountUser(BaseModel):
Expand Down
1 change: 1 addition & 0 deletions submit-api/src/submit_api/models/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

class UserType(enum.Enum):
"""Enum for user type."""

PROPONENT = 'PROPONENT'
STAFF = 'STAFF'

Expand Down
2 changes: 0 additions & 2 deletions submit-api/src/submit_api/schemas/item.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@

from submit_api.enums.item_status import ItemStatus
from submit_api.models.submission import SubmissionTypeStatus
from submit_api.schemas.account_user import AccountUserSchema
from submit_api.schemas.item_type import ItemTypeSchema
from submit_api.schemas.submission import SubmittedDocumentSchema, SubmittedFormSchema
from submit_api.schemas.user import UserSchema


class ItemSubmissionSchema(Schema):
Expand Down
5 changes: 3 additions & 2 deletions submit-api/src/submit_api/schemas/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from submit_api.models.package import PackageStatus
from submit_api.schemas.item import ItemSchema
from submit_api.schemas.package_type import PackageTypeSchema
from submit_api.schemas.user import UserSchema


class PostPackageRequestSchema(Schema):
Expand Down Expand Up @@ -69,5 +68,7 @@ class Meta: # pylint: disable=too-few-public-methods

@pre_dump
def get_submitted_by(self, obj, **kwargs):
obj.submitted_by = obj.submitted_by_user.account_user.full_name if obj.submitted_by_user and obj.submitted_by_user.account_user else None
"""Get submitted by."""
obj.submitted_by = obj.submitted_by_user.account_user.full_name \
if obj.submitted_by_user and obj.submitted_by_user.account_user else None
return obj
5 changes: 3 additions & 2 deletions submit-api/src/submit_api/schemas/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from marshmallow import EXCLUDE, Schema, fields, pre_dump

from submit_api.models.package import PackageStatus
from submit_api.schemas.account_user import AccountUserSchema
from submit_api.schemas.package_type import PackageTypeSchema


Expand Down Expand Up @@ -54,7 +53,9 @@ class Meta: # pylint: disable=too-few-public-methods

@pre_dump
def get_submitted_by(self, obj, **kwargs):
obj.submitted_by = obj.submitted_by_user.account_user.full_name if obj.submitted_by_user and obj.submitted_by_user.account_user else None
"""Get submitted by."""
obj.submitted_by = obj.submitted_by_user.account_user.full_name \
if obj.submitted_by_user and obj.submitted_by_user.account_user else None
return obj


Expand Down
2 changes: 0 additions & 2 deletions submit-api/src/submit_api/schemas/submission.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

from marshmallow import EXCLUDE, Schema, fields, pre_dump

from submit_api.schemas.account_user import AccountUserSchema


class SubmittedFormSchema(Schema):
"""submitted form schema."""
Expand Down
1 change: 0 additions & 1 deletion submit-web/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import RouterProviderWithAuthContext from "@/router";
import ModalProvider from "./components/Shared/Modals/ModalProvider";
import SnackBarProvider from "./components/Shared/Snackbar/SnackBarProvider";
import LoaderBackdropProvider from "./components/Shared/Overlays/LoaderBackdropProvider";
import { ReactQueryDevtools } from "@tanstack/react-query-devtools";

const queryClient = new QueryClient();

Expand Down
3 changes: 2 additions & 1 deletion submit-web/src/routes/__root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { AuthContextProps } from "react-oidc-context";
import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
import DrawerProvider from "@/components/Shared/Drawers/DrawerProvider";
import { QueryClient } from "@tanstack/react-query";
import { notify } from "@/components/Shared/Snackbar/snackbarStore";

type RouterContext = {
authentication: AuthContextProps;
Expand All @@ -27,7 +28,7 @@ function Layout() {
return (
<CatchBoundary
getResetKey={() => "reset"}
onCatch={(error) => console.log("boundary error", error)}
onCatch={(error) => notify.error(error.message)}
>
<EAOAppBar />
<DrawerProvider />
Expand Down

0 comments on commit 2cc74fe

Please sign in to comment.