enroll
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
USER_TABLE: str = os.getenv('USER_TABLE') # type: ignore
|
USER_TABLE: str = os.getenv('USER_TABLE') # type: ignore
|
||||||
|
ENROLLMENT_TABLE: str = os.getenv('ENROLLMENT_TABLE') # type: ignore
|
||||||
|
|
||||||
KONVIVA_API_URL: str = os.getenv('KONVIVA_API_URL') # type: ignore
|
KONVIVA_API_URL: str = os.getenv('KONVIVA_API_URL') # type: ignore
|
||||||
KONVIVA_SECRET_KEY: str = os.getenv('KONVIVA_SECRET_KEY') # type:ignore
|
KONVIVA_SECRET_KEY: str = os.getenv('KONVIVA_SECRET_KEY') # type:ignore
|
||||||
|
|||||||
@@ -4,13 +4,37 @@ from aws_lambda_powertools.utilities.data_classes import (
|
|||||||
event_source,
|
event_source,
|
||||||
)
|
)
|
||||||
from aws_lambda_powertools.utilities.typing import LambdaContext
|
from aws_lambda_powertools.utilities.typing import LambdaContext
|
||||||
|
from layercake.dynamodb import DynamoDBPersistenceLayer, KeyPair
|
||||||
|
|
||||||
|
import konviva
|
||||||
|
from boto3clients import dynamodb_client
|
||||||
|
from config import ENROLLMENT_TABLE
|
||||||
|
|
||||||
logger = Logger(__name__)
|
logger = Logger(__name__)
|
||||||
|
enrollment_layer = DynamoDBPersistenceLayer(ENROLLMENT_TABLE, dynamodb_client)
|
||||||
|
|
||||||
|
|
||||||
@event_source(data_class=EventBridgeEvent)
|
@event_source(data_class=EventBridgeEvent)
|
||||||
@logger.inject_lambda_context
|
@logger.inject_lambda_context
|
||||||
def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
|
def lambda_handler(event: EventBridgeEvent, context: LambdaContext) -> bool:
|
||||||
new_image = event.detail['new_image']
|
new_image = event.detail['new_image']
|
||||||
|
user_id = new_image['user_id']
|
||||||
|
class_id = new_image['class_id']
|
||||||
|
|
||||||
return True
|
try:
|
||||||
|
enrollment_id = konviva.enroll(
|
||||||
|
user_id,
|
||||||
|
class_id,
|
||||||
|
)
|
||||||
|
except konviva.KonvivaError as err:
|
||||||
|
logger.exception(err)
|
||||||
|
return False
|
||||||
|
|
||||||
|
return enrollment_layer.update_item(
|
||||||
|
key=KeyPair(new_image['id'], 'konviva'),
|
||||||
|
update_expr='SET enrollment_id = :enrollment_id',
|
||||||
|
cond_expr='attribute_exists(sk)',
|
||||||
|
expr_attr_values={
|
||||||
|
':enrollment_id': enrollment_id,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
from dataclasses import dataclass
|
|
||||||
from urllib.parse import quote_plus, urlparse
|
from urllib.parse import quote_plus, urlparse
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
@@ -27,15 +26,6 @@ class EmailAlreadyExistsError(KonvivaError):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class User:
|
|
||||||
IDUsuario: int
|
|
||||||
Identificador: str
|
|
||||||
NomeUsuario: str
|
|
||||||
Email: str
|
|
||||||
CPF: str | None = None
|
|
||||||
|
|
||||||
|
|
||||||
def create_user(
|
def create_user(
|
||||||
id: str,
|
id: str,
|
||||||
name: str,
|
name: str,
|
||||||
@@ -97,7 +87,6 @@ def update_user(id: str, **kwargs) -> dict:
|
|||||||
)
|
)
|
||||||
r.raise_for_status()
|
r.raise_for_status()
|
||||||
|
|
||||||
# Because Konviva does not return the proper HTTP status code
|
|
||||||
if err := glom(r.json(), 'errors', default=None):
|
if err := glom(r.json(), 'errors', default=None):
|
||||||
err = err[0] if isinstance(err, list) else err
|
err = err[0] if isinstance(err, list) else err
|
||||||
raise KonvivaError(err)
|
raise KonvivaError(err)
|
||||||
@@ -120,3 +109,24 @@ def get_users_by_email(email: str) -> list[dict]:
|
|||||||
return []
|
return []
|
||||||
|
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
|
|
||||||
|
def enroll(user_id: str, class_id: str) -> str:
|
||||||
|
url = urlparse(KONVIVA_API_URL)._replace(path='/action/api/integrarMatricula')
|
||||||
|
|
||||||
|
r = requests.post(
|
||||||
|
url=url.geturl(),
|
||||||
|
headers=headers,
|
||||||
|
json={
|
||||||
|
'IDUsuario': str(user_id),
|
||||||
|
'IDTurma': str(class_id),
|
||||||
|
'StatusMatricula': 'MATRICULADO',
|
||||||
|
},
|
||||||
|
)
|
||||||
|
r.raise_for_status()
|
||||||
|
|
||||||
|
if err := glom(r.json(), 'errors', default=None):
|
||||||
|
err = err[0] if isinstance(err, list) else err
|
||||||
|
raise KonvivaError(err)
|
||||||
|
|
||||||
|
return r.json().get('IDMatricula')
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
USER_TABLE: str = os.getenv('USER_TABLE') # type: ignore
|
USER_TABLE: str = os.getenv('USER_TABLE') # type: ignore
|
||||||
|
ENROLLMENT_TABLE: str = os.getenv('ENROLLMENT_TABLE') # type: ignore
|
||||||
|
|
||||||
KONVIVA_API_URL: str = os.getenv('KONVIVA_API_URL') # type: ignore
|
KONVIVA_API_URL: str = os.getenv('KONVIVA_API_URL') # type: ignore
|
||||||
KONVIVA_SECRET_KEY: str = os.getenv('KONVIVA_SECRET_KEY') # type:ignore
|
KONVIVA_SECRET_KEY: str = os.getenv('KONVIVA_SECRET_KEY') # type:ignore
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ Parameters:
|
|||||||
UserTable:
|
UserTable:
|
||||||
Type: String
|
Type: String
|
||||||
Default: betaeducacao-prod-users_d2o3r5gmm4it7j
|
Default: betaeducacao-prod-users_d2o3r5gmm4it7j
|
||||||
|
EnrollmentTable:
|
||||||
|
Type: String
|
||||||
|
Default: betaeducacao-prod-enrollments
|
||||||
|
|
||||||
Globals:
|
Globals:
|
||||||
Function:
|
Function:
|
||||||
@@ -23,6 +26,7 @@ Globals:
|
|||||||
POWERTOOLS_LOGGER_SAMPLE_RATE: 0.1
|
POWERTOOLS_LOGGER_SAMPLE_RATE: 0.1
|
||||||
POWERTOOLS_LOGGER_LOG_EVENT: true
|
POWERTOOLS_LOGGER_LOG_EVENT: true
|
||||||
USER_TABLE: !Ref UserTable
|
USER_TABLE: !Ref UserTable
|
||||||
|
ENROLLMENT_TABLE: !Ref EnrollmentTable
|
||||||
KONVIVA_API_URL: https://lms.saladeaula.digital
|
KONVIVA_API_URL: https://lms.saladeaula.digital
|
||||||
KONVIVA_SECRET_KEY: "{{resolve:ssm:/betaeducacao/konviva/secret_key/str}}"
|
KONVIVA_SECRET_KEY: "{{resolve:ssm:/betaeducacao/konviva/secret_key/str}}"
|
||||||
|
|
||||||
@@ -55,3 +59,25 @@ Resources:
|
|||||||
- exists: false
|
- exists: false
|
||||||
metadata__konviva_user_id:
|
metadata__konviva_user_id:
|
||||||
- exists: false
|
- exists: false
|
||||||
|
|
||||||
|
EventEnrollFunction:
|
||||||
|
Type: AWS::Serverless::Function
|
||||||
|
Properties:
|
||||||
|
Handler: events.enroll.lambda_handler
|
||||||
|
LoggingConfig:
|
||||||
|
LogGroup: !Ref EventLog
|
||||||
|
Policies:
|
||||||
|
- DynamoDBWritePolicy:
|
||||||
|
TableName: !Ref EnrollmentTable
|
||||||
|
Events:
|
||||||
|
DynamoDBEvent:
|
||||||
|
Type: EventBridgeRule
|
||||||
|
Properties:
|
||||||
|
Pattern:
|
||||||
|
resources: [!Ref EnrollmentTable]
|
||||||
|
detail-type: [INSERT]
|
||||||
|
detail:
|
||||||
|
new_image:
|
||||||
|
sk: ["konviva"]
|
||||||
|
enrollment_id:
|
||||||
|
- exists: false
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ def pytest_configure():
|
|||||||
os.environ['DYNAMODB_PARTITION_KEY'] = PK
|
os.environ['DYNAMODB_PARTITION_KEY'] = PK
|
||||||
os.environ['DYNAMODB_SORT_KEY'] = SK
|
os.environ['DYNAMODB_SORT_KEY'] = SK
|
||||||
os.environ['USER_TABLE'] = PYTEST_TABLE_NAME
|
os.environ['USER_TABLE'] = PYTEST_TABLE_NAME
|
||||||
|
os.environ['ENROLLMENT_TABLE'] = PYTEST_TABLE_NAME
|
||||||
os.environ['KONVIVA_API_URL'] = 'https://lms.saladeaula.digital'
|
os.environ['KONVIVA_API_URL'] = 'https://lms.saladeaula.digital'
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
18
konviva-events/tests/events/test_enroll.py
Normal file
18
konviva-events/tests/events/test_enroll.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
from aws_lambda_powertools.utilities.typing import LambdaContext
|
||||||
|
|
||||||
|
import events.enroll as app
|
||||||
|
|
||||||
|
|
||||||
|
def test_enroll(dynamodb_client, dynamodb_seeds, lambda_context: LambdaContext):
|
||||||
|
event = {
|
||||||
|
'detail': {
|
||||||
|
'new_image': {
|
||||||
|
'id': '03ad39c6-055e-48d8-acc8-e11385ed8904',
|
||||||
|
'sk': 'konviva',
|
||||||
|
'class_id': 275,
|
||||||
|
'user_id': 26943,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
assert not app.lambda_handler(event, lambda_context) # type: ignore
|
||||||
@@ -1 +1,2 @@
|
|||||||
{"id": {"S": "123"}, "sk": {"S": "0"}}
|
{"id": {"S": "123"}, "sk": {"S": "0"}}
|
||||||
|
{"id": {"S": "03ad39c6-055e-48d8-acc8-e11385ed8904"}, "sk": {"S": "konviva"}, "user_id": {"N": "275"}, "class_id": {"N": "26943"}}
|
||||||
Reference in New Issue
Block a user