Skip to content
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

feat: adding test lambda for post #329

Merged
merged 2 commits into from
Sep 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 59 additions & 17 deletions lib/constructs/business/api-endpoint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,31 @@ import { API_DOMAIN } from '../../configs/route53/domain';
import { GraphqlApiService } from './graphql-api-service';
import { AbstractHttpApiService } from './http-api-service';
import { RestApiService } from './rest-api-service';
import { GraphqlApiServiceId, graphqlApiServiceMap, RestApiServiceId, restApiServiceMap } from './service';
import {
GraphqlApiServiceId,
graphqlApiServiceMap,
RestApiServiceId,
restApiServiceMap,
} from './service';

export interface ApiEndpointProps {
zone: route53.IHostedZone;
authProvider?: cognito.IUserPool;
}

export abstract class AbstractApiEndpoint extends Construct {
abstract readonly apiEndpoint: apigw.RestApi | apigw.LambdaRestApi | apigw.SpecRestApi | apigw2.HttpApi | appsync.GraphqlApi;
abstract readonly apiEndpoint:
| apigw.RestApi
| apigw.LambdaRestApi
| apigw.SpecRestApi
| apigw2.HttpApi
| appsync.GraphqlApi;

protected constructor(scope: Construct, id: string, props?: ApiEndpointProps) {
protected constructor(
scope: Construct,
id: string,
props?: ApiEndpointProps,
) {
super(scope, id);
}
}
Expand All @@ -44,24 +58,29 @@ export abstract class AbstractRestApiEndpoint extends AbstractApiEndpoint {
}

public getDomain(): string {
const domainName: apigw.DomainName | undefined = this.apiEndpoint.domainName;
const domainName: apigw.DomainName | undefined =
this.apiEndpoint.domainName;

if (typeof domainName === 'undefined') {
throw RangeError('Domain not configured for this API endpoint.');
}
return domainName.domainName;
}

public addService(name: RestApiServiceId, dataSource?: string, auth = false): this {
this.apiServices[name] = new restApiServiceMap[name](this, `${ name }-api`, {
public addService(
name: RestApiServiceId,
dataSource?: string,
auth = false,
): this {
this.apiServices[name] = new restApiServiceMap[name](this, `${name}-api`, {
dataSource: dataSource,
authorizer: auth ? this.authorizer : undefined,
validator: this.reqValidator,
});
return this;
}

public abstract deploy(): void
public abstract deploy(): void;
}

export abstract class AbstractGraphqlEndpoint extends AbstractApiEndpoint {
Expand All @@ -75,16 +94,30 @@ export abstract class AbstractGraphqlEndpoint extends AbstractApiEndpoint {
super(scope, id, props);
}

public addService(name: GraphqlApiServiceId, dataSource: string, auth = 'apiKey'): this {
this.apiServices[name] = new graphqlApiServiceMap[name](this, `${ name }-api`, {
dataSource: dynamodb.Table.fromTableName(this, `${ name }-table`, dataSource),
auth: this.authMode[auth],
});
public addService(
name: GraphqlApiServiceId,
dataSource: string,
auth = 'apiKey',
): this {
this.apiServices[name] = new graphqlApiServiceMap[name](
this,
`${name}-api`,
{
dataSource: dynamodb.Table.fromTableName(
this,
`${name}-table`,
dataSource,
),
auth: this.authMode[auth],
},
);
return this;
}

public getDomain(): string {
const domain = this.apiEndpoint.graphqlUrl.match(/https:\/\/(.*)\/graphql/g);
const domain = this.apiEndpoint.graphqlUrl.match(
/https:\/\/(.*)\/graphql/g,
);
if (domain === null) {
return '';
}
Expand Down Expand Up @@ -127,7 +160,12 @@ export class WasedaTimeRestApiEndpoint extends AbstractRestApiEndpoint {
description: 'The main API endpoint for WasedaTime Web App.',
endpointTypes: [apigw.EndpointType.REGIONAL],
deploy: false,
binaryMediaTypes: ['application/pdf', 'image/png'],
binaryMediaTypes: [
'application/pdf',
'image/png',
'image/jpeg',
'image/gif',
],
});
this.apiEndpoint.addGatewayResponse('4xx-resp', {
type: apigw.ResponseType.DEFAULT_4XX,
Expand Down Expand Up @@ -171,7 +209,9 @@ export class WasedaTimeRestApiEndpoint extends AbstractRestApiEndpoint {
});
new route53.ARecord(this, 'alias-record', {
zone: props.zone,
target: route53.RecordTarget.fromAlias(new route53_targets.ApiGatewayDomain(this.domain)),
target: route53.RecordTarget.fromAlias(
new route53_targets.ApiGatewayDomain(this.domain),
),
recordName: API_DOMAIN,
});
}
Expand All @@ -186,7 +226,10 @@ export class WasedaTimeRestApiEndpoint extends AbstractRestApiEndpoint {
api: this.apiEndpoint,
retainDeployments: false,
});
const hash = Buffer.from(flatted.stringify(this.apiServices), 'binary').toString('base64');
const hash = Buffer.from(
flatted.stringify(this.apiServices),
'binary',
).toString('base64');
if (STAGE === 'dev') {
devDeployment.addToLogicalId(hash);
} else if (STAGE === 'prod') {
Expand Down Expand Up @@ -232,7 +275,6 @@ export class WasedaTimeGraphqlEndpoint extends AbstractGraphqlEndpoint {
readonly apiServices: { [name: string]: GraphqlApiService } = {};

constructor(scope: Construct, id: string, props: ApiEndpointProps) {

super(scope, id, props);

const apiKeyAuth: appsync.AuthorizationMode = {
Expand Down
38 changes: 37 additions & 1 deletion lib/constructs/business/rest-api-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,7 @@ export class ForumThreadsApiService extends RestApiService {
const boardResource = root.addResource('{board_id}');
const threadResource = boardResource.addResource('{thread_id}');
const userResource = root.addResource('user');
const testResource = root.addResource('test');

const optionsForumHome = root.addCorsPreflight({
allowOrigins: allowOrigins,
Expand Down Expand Up @@ -766,6 +767,18 @@ export class ForumThreadsApiService extends RestApiService {
],
});

const optionsTestThreads = testResource.addCorsPreflight({
allowOrigins: allowOrigins,
allowHeaders: allowHeaders,
allowMethods: [
apigw2.HttpMethod.GET,
apigw2.HttpMethod.POST,
apigw2.HttpMethod.PATCH,
apigw2.HttpMethod.DELETE,
apigw2.HttpMethod.OPTIONS,
],
});

const getRespModel = scope.apiEndpoint.addModel('threads-get-resp-model', {
schema: forumThreadGetRespSchema,
contentType: 'application/json',
Expand Down Expand Up @@ -820,6 +833,10 @@ export class ForumThreadsApiService extends RestApiService {
forumThreadsFunctions.deleteFunction,
{ proxy: true },
);
const testPostIntegration = new apigw.LambdaIntegration(
forumThreadsFunctions.testPostFunction,
{ proxy: true },
);

const getAllForumThreads = root.addMethod(
apigw2.HttpMethod.GET,
Expand Down Expand Up @@ -919,13 +936,28 @@ export class ForumThreadsApiService extends RestApiService {
requestValidator: props.validator,
},
);
const testPostForumThreads = threadResource.addMethod(
apigw2.HttpMethod.POST,
testPostIntegration,
{
operationName: 'testThread',
methodResponses: [
{
statusCode: '200',
responseParameters: lambdaRespParams,
},
],
authorizer: props.authorizer,
requestValidator: props.validator,
},
);

this.resourceMapping = {
'/forum': {
[apigw2.HttpMethod.GET]: getAllForumThreads,
[apigw2.HttpMethod.OPTIONS]: optionsForumHome,
},
'/forum/{uid}': {
'/forum/user': {
[apigw2.HttpMethod.GET]: getUserForumThreads,
[apigw2.HttpMethod.OPTIONS]: optionsUserThreads,
},
Expand All @@ -939,6 +971,10 @@ export class ForumThreadsApiService extends RestApiService {
[apigw2.HttpMethod.PATCH]: patchForumThreads,
[apigw2.HttpMethod.DELETE]: deleteForumThreads,
},
'/forum/test': {
[apigw2.HttpMethod.POST]: testPostForumThreads,
[apigw2.HttpMethod.OPTIONS]: optionsTestThreads,
},
};
}
}
Expand Down
17 changes: 17 additions & 0 deletions lib/constructs/common/lambda-functions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,7 @@ export class ForumThreadFunctions extends Construct {
readonly postFunction: lambda.Function;
readonly patchFunction: lambda.Function;
readonly deleteFunction: lambda.Function;
readonly testPostFunction: lambda.Function;

constructor(scope: Construct, id: string, props: FunctionsProps) {
super(scope, id);
Expand Down Expand Up @@ -642,6 +643,22 @@ export class ForumThreadFunctions extends Construct {
timeout: Duration.seconds(3),
environment: props.envVars,
});

this.testPostFunction = new lambda_py.PythonFunction(
this,
'test-post-thread',
{
entry: 'src/lambda/test-post-thread',
description: 'lambda to test forum functionalities',
functionName: 'test-forum-thread',
logRetention: logs.RetentionDays.ONE_MONTH,
memorySize: 128,
role: DBPutRole,
runtime: lambda.Runtime.PYTHON_3_9,
timeout: Duration.seconds(3),
environment: props.envVars,
},
);
}
}

Expand Down
68 changes: 68 additions & 0 deletions src/lambda/test-post-thread/index.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
from boto3.dynamodb.conditions import Key
import json
from datetime import datetime
from utils import JsonPayloadBuilder, table, resp_handler, build_thread_id, s3_client, bucket
import uuid
import base64


@resp_handler
def test_post_thread(thread, uid):

thread_id = build_thread_id()

text = thread["body"]

dt_now = datetime.now().strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3] + 'Z'

object_key = None
if "image" in thread:
image_data = base64.b64decode(thread["image"])
content_type = thread.get("contentType", "image/jpeg")
# Validate the content type
if content_type not in ["image/jpeg", "image/png", "image/gif"]:
raise ValueError("Invalid content type")
# Extracts 'jpeg', 'png', or 'gif' from the MIME type
extension = content_type.split("/")[-1]
object_key = f"{thread_id}/image.{extension}"

s3_client.put_object(Bucket=bucket, Key=object_key,
Body=image_data, ContentType=content_type)

thread_item = {
"board_id": thread["board_id"],
"created_at": dt_now,
"updated_at": dt_now,
"title": thread["title"],
"body": text,
"uid": uid,
"thread_id": thread_id,
"tag_id": thread["tag_id"],
"group_id": thread["group_id"],
"univ_id": thread["univ_id"],
"views": 0,
"comment_count": 0,
"new_comment": False,
"obj_key": object_key,
}

table.put_item(Item=thread_item)

thread_item.pop('uid', None)
thread_item["mod"] = True

body = JsonPayloadBuilder().add_status(
True).add_data(thread_item).add_message('').compile()
return body


def handler(event, context):

req = json.loads(event['body'])
params = {
# "board_id": event["pathParameters"]["board_id"],
"thread": req["data"],
"uid": event['requestContext']['authorizer']['claims']['sub']
}

return test_post_thread(**params)
Loading
Loading