-
Notifications
You must be signed in to change notification settings - Fork 19
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add video widget admin side component and resource #1828
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
d6aa3be
Add video widget model and option card
jadmsaadaot 9351d32
add video widget service and resource
jadmsaadaot fa466b9
Add video widget crud and UI component
jadmsaadaot 2eb31b2
Merge branch 'main' into MET-task#1655
jadmsaadaot 8e5f087
Fix linting issue
jadmsaadaot 321881e
Merge branch 'main' into MET-task#1655
jadmsaadaot 22eafd0
Merge branch 'main' into MET-task#1655
jadmsaadaot 57d6010
Merge remote-tracking branch 'upstream/main' into MET-task#1655
jadmsaadaot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
"""Add video widget | ||
Revision ID: 47fc88fe0477 | ||
Revises: b3b5c66cea4b | ||
Create Date: 2023-07-11 10:44:35.980432 | ||
""" | ||
from alembic import op | ||
import sqlalchemy as sa | ||
|
||
# revision identifiers, used by Alembic. | ||
revision = '47fc88fe0477' | ||
down_revision = 'b3b5c66cea4b' | ||
branch_labels = None | ||
depends_on = None | ||
|
||
|
||
def upgrade(): | ||
# ### commands auto generated by Alembic - please adjust! ### | ||
op.create_table('widget_video', | ||
sa.Column('created_date', sa.DateTime(), nullable=False), | ||
sa.Column('updated_date', sa.DateTime(), nullable=True), | ||
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False), | ||
sa.Column('widget_id', sa.Integer(), nullable=True), | ||
sa.Column('engagement_id', sa.Integer(), nullable=True), | ||
sa.Column('video_url', sa.String(length=255), nullable=False), | ||
sa.Column('description', sa.Text(), nullable=True), | ||
sa.Column('created_by', sa.String(length=50), nullable=True), | ||
sa.Column('updated_by', sa.String(length=50), nullable=True), | ||
sa.ForeignKeyConstraint(['engagement_id'], ['engagement.id'], ondelete='CASCADE'), | ||
sa.ForeignKeyConstraint(['widget_id'], ['widget.id'], ondelete='CASCADE'), | ||
sa.PrimaryKeyConstraint('id') | ||
) | ||
widget_type_table = sa.table('widget_type', | ||
sa.Column('id', sa.Integer), | ||
sa.Column('name', sa.String), | ||
sa.Column('description', sa.String)) | ||
|
||
op.bulk_insert(widget_type_table, [ | ||
{'id': 7, 'name': 'Video', 'description': 'Add a link to a hosted video and link preview'} | ||
]) | ||
# ### end Alembic commands ### | ||
|
||
|
||
def downgrade(): | ||
# ### commands auto generated by Alembic - please adjust! ### | ||
op.drop_table('widget_video') | ||
|
||
conn = op.get_bind() | ||
|
||
conn.execute('DELETE FROM widget_type WHERE id=7') | ||
# ### end Alembic commands ### |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
"""WidgetVideo model class. | ||
Manages the video widget | ||
""" | ||
from __future__ import annotations | ||
|
||
from sqlalchemy.sql.schema import ForeignKey | ||
|
||
from .base_model import BaseModel | ||
from .db import db | ||
|
||
|
||
class WidgetVideo(BaseModel): # pylint: disable=too-few-public-methods, too-many-instance-attributes | ||
"""Definition of the Video entity.""" | ||
|
||
__tablename__ = 'widget_video' | ||
id = db.Column(db.Integer, primary_key=True, autoincrement=True) | ||
widget_id = db.Column(db.Integer, ForeignKey('widget.id', ondelete='CASCADE'), nullable=True) | ||
engagement_id = db.Column(db.Integer, ForeignKey('engagement.id', ondelete='CASCADE'), nullable=True) | ||
video_url = db.Column(db.String(255), nullable=False) | ||
description = db.Column(db.Text()) | ||
|
||
@classmethod | ||
def get_video(cls, widget_id) -> list[WidgetVideo]: | ||
"""Get video.""" | ||
widget_video = db.session.query(WidgetVideo) \ | ||
.filter(WidgetVideo.widget_id == widget_id) \ | ||
.all() | ||
return widget_video | ||
|
||
@classmethod | ||
def update_video(cls, video_widget_id, video_data: dict) -> WidgetVideo: | ||
"""Update video.""" | ||
widget_video: WidgetVideo = WidgetVideo.query.get(video_widget_id) | ||
if widget_video: | ||
for key, value in video_data.items(): | ||
setattr(widget_video, key, value) | ||
widget_video.save() | ||
return widget_video |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
# Copyright © 2021 Province of British Columbia | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the 'License'); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an 'AS IS' BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
"""API endpoints for managing a video widget resource.""" | ||
from http import HTTPStatus | ||
|
||
from flask import request | ||
from flask_cors import cross_origin | ||
from flask_restx import Namespace, Resource | ||
|
||
from met_api.auth import jwt as _jwt | ||
from met_api.exceptions.business_exception import BusinessException | ||
from met_api.schemas import utils as schema_utils | ||
from met_api.schemas.widget_video import WidgetVideoSchema | ||
from met_api.services.widget_video_service import WidgetVideoService | ||
from met_api.utils.roles import Role | ||
from met_api.utils.util import allowedorigins, cors_preflight | ||
|
||
|
||
API = Namespace('widget_videos', description='Endpoints for Video Widget Management') | ||
"""Widget Videos""" | ||
|
||
|
||
@cors_preflight('GET, POST, PATCH, OPTIONS') | ||
@API.route('') | ||
class Videos(Resource): | ||
"""Resource for managing video widgets.""" | ||
|
||
@staticmethod | ||
@cross_origin(origins=allowedorigins()) | ||
def get(widget_id): | ||
"""Get video widget.""" | ||
try: | ||
widget_video = WidgetVideoService().get_video(widget_id) | ||
return WidgetVideoSchema().dump(widget_video, many=True), HTTPStatus.OK | ||
except BusinessException as err: | ||
return str(err), err.status_code | ||
|
||
@staticmethod | ||
@cross_origin(origins=allowedorigins()) | ||
@_jwt.has_one_of_roles([Role.EDIT_ENGAGEMENT.value]) | ||
def post(widget_id): | ||
"""Create video widget.""" | ||
try: | ||
request_json = request.get_json() | ||
widget_video = WidgetVideoService().create_video(widget_id, request_json) | ||
return WidgetVideoSchema().dump(widget_video), HTTPStatus.OK | ||
except BusinessException as err: | ||
return str(err), err.status_code | ||
|
||
|
||
@cors_preflight('PATCH') | ||
@API.route('/<int:video_widget_id>') | ||
class Video(Resource): | ||
"""Resource for managing video widgets.""" | ||
|
||
@staticmethod | ||
@cross_origin(origins=allowedorigins()) | ||
@_jwt.has_one_of_roles([Role.EDIT_ENGAGEMENT.value]) | ||
def patch(widget_id, video_widget_id): | ||
"""Update video widget.""" | ||
request_json = request.get_json() | ||
valid_format, errors = schema_utils.validate(request_json, 'video_widget_update') | ||
if not valid_format: | ||
return {'message': schema_utils.serialize(errors)}, HTTPStatus.BAD_REQUEST | ||
try: | ||
widget_video = WidgetVideoService().update_video(widget_id, video_widget_id, request_json) | ||
return WidgetVideoSchema().dump(widget_video), HTTPStatus.OK | ||
except BusinessException as err: | ||
return str(err), err.status_code |
31 changes: 31 additions & 0 deletions
31
met-api/src/met_api/schemas/schemas/video_widget_update.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
{ | ||
"$schema": "http://json-schema.org/draft-07/schema", | ||
"$id": "https://met.gov.bc.ca/.well_known/schemas/video_widget_update", | ||
"type": "object", | ||
"title": "The root schema", | ||
"description": "The root schema comprises the entire JSON document.", | ||
"default": {}, | ||
"examples": [ | ||
{ | ||
"description": "A video widget description", | ||
"video_url": "https://www.youtube.com" | ||
} | ||
], | ||
"required": [], | ||
"properties": { | ||
"description": { | ||
"$id": "#/properties/description", | ||
"type": "string", | ||
"title": "Video description", | ||
"description": "The description of this video.", | ||
"examples": ["A video widget description"] | ||
}, | ||
"video_url": { | ||
"$id": "#/properties/video_url", | ||
"type": "string", | ||
"title": "Video url", | ||
"description": "The url link to this video.", | ||
"examples": ["https://www.youtube.com"] | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
# Copyright © 2019 Province of British Columbia | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
"""Manager for widget video schema.""" | ||
|
||
from met_api.models.widget_video import WidgetVideo as WidgetVideoModel | ||
|
||
from marshmallow import Schema | ||
|
||
|
||
class WidgetVideoSchema(Schema): # pylint: disable=too-many-ancestors, too-few-public-methods | ||
"""This is the schema for the video model.""" | ||
|
||
class Meta: # pylint: disable=too-few-public-methods | ||
"""Videos all of the Widget Video fields to a default schema.""" | ||
|
||
model = WidgetVideoModel | ||
fields = ('id', 'widget_id', 'engagement_id', 'video_url', 'description') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
"""Service for Widget Video management.""" | ||
from met_api.models.widget_video import WidgetVideo as WidgetVideoModel | ||
|
||
|
||
class WidgetVideoService: | ||
"""Widget Video management service.""" | ||
|
||
@staticmethod | ||
def get_video(widget_id): | ||
"""Get video by widget id.""" | ||
widget_video = WidgetVideoModel.get_video(widget_id) | ||
return widget_video | ||
|
||
@staticmethod | ||
def create_video(widget_id, video_details: dict): | ||
"""Create video for the widget.""" | ||
video_data = dict(video_details) | ||
widget_video = WidgetVideoService._create_video_model(widget_id, video_data) | ||
widget_video.commit() | ||
return widget_video | ||
|
||
@staticmethod | ||
def update_video(widget_id, video_widget_id, video_data): | ||
"""Update video widget.""" | ||
widget_video: WidgetVideoModel = WidgetVideoModel.find_by_id(video_widget_id) | ||
if not widget_video: | ||
raise KeyError('Video widget not found') | ||
|
||
if widget_video.widget_id != widget_id: | ||
raise ValueError('Invalid widgets and video') | ||
|
||
return WidgetVideoModel.update_video(widget_video.id, video_data) | ||
|
||
@staticmethod | ||
def _create_video_model(widget_id, video_data: dict): | ||
video_model: WidgetVideoModel = WidgetVideoModel() | ||
video_model.widget_id = widget_id | ||
video_model.engagement_id = video_data.get('engagement_id') | ||
video_model.video_url = video_data.get('video_url') | ||
video_model.description = video_data.get('description') | ||
video_model.flush() | ||
return video_model |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in one of the alembic scripts , i haev a better of handling the increment numbers.. can you look up that?
basically it reads value from the sequnce and does a plus one
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's definitely a smarter way to do it. I just choose to hard code 7 here because it is hard coded in the front end:
And types are hard coded in the backend in the constants in WidgetType which is used for the tests. I wasn't comfortable leaving it up for a calculation although it will reach the same result of 7. What do you think