Bump flask-sqlalchemy from 3.0.3 to 3.1.1 (#146)

* Bump flask-sqlalchemy from 3.0.3 to 3.1.1

Bumps [flask-sqlalchemy](https://github.com/pallets-eco/flask-sqlalchemy) from 3.0.3 to 3.1.1.
- [Release notes](https://github.com/pallets-eco/flask-sqlalchemy/releases)
- [Changelog](https://github.com/pallets-eco/flask-sqlalchemy/blob/main/CHANGES.rst)
- [Commits](pallets-eco/flask-sqlalchemy@3.0.3...3.1.1)

---
updated-dependencies:
- dependency-name: flask-sqlalchemy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* updating marshmallow imports for newer version

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sarah Sloan <[email protected]>
Co-authored-by: srh-sloan <[email protected]>

app.py

@@ -12,7 +12,6 @@
 
 from config import Config
 from db import db
-from db import ma
 from db import migrate
 
 
@@ -37,8 +36,6 @@ def create_app() -> Flask:
     db.init_app(flask_app)
     # Bind Flask-Migrate db utilities to Flask app
     migrate.init_app(flask_app, db, directory="db/migrations", render_as_batch=True)
-    # Bind Marshmallow schema to Flask app
-    ma.init_app(flask_app)
 
     # Add healthchecks to flask_app
     health = Healthcheck(flask_app)

db/__init__.py

@@ -1,4 +1,3 @@
-from flask_marshmallow import Marshmallow
 from flask_migrate import Migrate
 from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy import MetaData
@@ -14,6 +13,5 @@
 metadata = MetaData(naming_convention=convention)
 
 db = SQLAlchemy(metadata=metadata)
-ma = Marshmallow()
 
 migrate = Migrate()

db/schemas/account.py

@@ -1,16 +1,18 @@
 from marshmallow import fields
+from marshmallow.fields import Function
+from marshmallow_sqlalchemy import SQLAlchemyAutoSchema
+from marshmallow_sqlalchemy import auto_field
 
-from db import ma
 from db.models.account import Account
 
 
-class AccountSchema(ma.SQLAlchemySchema):
+class AccountSchema(SQLAlchemyAutoSchema):
     class Meta:
         model = Account
 
     id = fields.UUID(data_key="account_id")
     email = fields.String(data_key="email_address")
-    full_name = ma.auto_field()
-    azure_ad_subject_id = ma.auto_field()
-    roles = ma.Function(lambda obj: [role.role for role in obj.roles])
-    highest_role_map = ma.Function(lambda obj: obj.highest_role_map)
+    full_name = auto_field()
+    azure_ad_subject_id = auto_field()
+    roles = Function(lambda obj: [role.role for role in obj.roles])
+    highest_role_map = Function(lambda obj: obj.highest_role_map)

db/schemas/role.py

@@ -1,10 +1,12 @@
-from db import ma
+from marshmallow_sqlalchemy import SQLAlchemyAutoSchema
+from marshmallow_sqlalchemy import auto_field
+
 from db.models.role import Role
 
 
-class RoleSchema(ma.SQLAlchemyAutoSchema):
+class RoleSchema(SQLAlchemyAutoSchema):
     class Meta:
         model = Role
         include_fk = True
 
-    role = ma.auto_field()
+    role = auto_field()

requirements-dev.txt

@@ -134,7 +134,7 @@ flask-redis==0.4.0
     # via
     #   -r requirements.txt
     #   funding-service-design-utils
-flask-sqlalchemy==3.0.3
+flask-sqlalchemy==3.1.1
     # via
     #   -r requirements.txt
     #   flask-migrate
@@ -409,7 +409,7 @@ soupsieve==2.4.1
     # via
     #   -r requirements.txt
     #   beautifulsoup4
-sqlalchemy==1.4.44
+sqlalchemy==2.0.24
     # via
     #   -r requirements.txt
     #   alembic
@@ -441,6 +441,7 @@ typing-extensions==4.4.0
     #   alembic
     #   alembic-utils
     #   flupy
+    #   sqlalchemy
 urllib3==1.26.18
     # via
     #   -r requirements.txt

requirements.txt

@@ -75,7 +75,7 @@ flask-migrate==4.0.5
     #   funding-service-design-utils
 flask-redis==0.4.0
     # via funding-service-design-utils
-flask-sqlalchemy==3.0.3
+flask-sqlalchemy==3.1.1
     # via
     #   -r requirements.in
     #   flask-migrate
@@ -222,9 +222,7 @@ s3transfer==0.6.1
 semver==2.13.0
     # via prance
 sentry-sdk[flask]==1.31.0
-    # via
-    #   funding-service-design-utils
-    #   sentry-sdk
+    # via funding-service-design-utils
 shortuuid==1.0.11
     # via -r requirements.in
 six==1.16.0
@@ -237,7 +235,7 @@ six==1.16.0
     #   thrift
 soupsieve==2.4.1
     # via beautifulsoup4
-sqlalchemy==1.4.44
+sqlalchemy==2.0.24
     # via
     #   -r requirements.in
     #   alembic
@@ -258,6 +256,7 @@ typing-extensions==4.4.0
     #   alembic
     #   alembic-utils
     #   flupy
+    #   sqlalchemy
 urllib3==1.26.18
     # via
     #   botocore