serverless ms updated

Author: mehmetozkaya

.gitignore

@@ -4,4 +4,4 @@ node_modules
 
 # CDK asset staging directory
 .cdk.staging
-cdk.out
+cdk.out

README.md

@@ -1,14 +1,14 @@
-# Welcome to your CDK TypeScript project!
+# Welcome to your CDK TypeScript project
 
 This is a blank project for TypeScript development with CDK.
 
 The `cdk.json` file tells the CDK Toolkit how to execute your app.
 
 ## Useful commands
 
- * `npm run build` compile typescript to js
- * `npm run watch` watch for changes and compile
- * `npm run test` perform the jest unit tests
- * `cdk deploy` deploy this stack to your default AWS account/region
- * `cdk diff` compare deployed stack with current state
- * `cdk synth` emits the synthesized CloudFormation template
+* `npm run build` compile typescript to js
+* `npm run watch` watch for changes and compile
+* `npm run test` perform the jest unit tests
+* `cdk deploy` deploy this stack to your default AWS account/region
+* `cdk diff` compare deployed stack with current state
+* `cdk synth` emits the synthesized CloudFormation template

lib/apigateway.ts

@@ -8,59 +8,55 @@ interface SwnApiGatewayProps {
  orderingMicroservices: IFunction
 }
 
-export class SwnApiGateway extends Construct {
+export class SwnApiGateway extends Construct { 
 
- constructor(scope: Construct, id: string, props: SwnApiGatewayProps){
+ constructor(scope: Construct, id: string, props: SwnApiGatewayProps) {
  super(scope, id);
 
  // Product api gateway
  this.createProductApi(props.productMicroservice);
  // Basket api gateway
- this.createBasketApi(props.basketMicroservice); 
+ this.createBasketApi(props.basketMicroservice);
  // Ordering api gateway
  this.createOrderApi(props.orderingMicroservices);
  }
 
  private createProductApi(productMicroservice: IFunction) {
- 
- // Product microservices api gateway
- // root name = product
- 
- // GET /product
- // POST /product
-
- // Single product with id parameter
- // GET /product/{id}
- // PUT /product/{id}
- // DELETE /product/{id}
-
- const apigw = new LambdaRestApi(this, 'productApi', {
- restApiName: 'Product Service',
- handler: productMicroservice,
- proxy: false
- });
- 
- const product = apigw.root.addResource('product');
- product.addMethod('GET'); // GET /product
- product.addMethod('POST'); // POST /product
- 
- const singleProduct = product.addResource('{id}');
- singleProduct.addMethod('GET'); // GET /product/{id}
- singleProduct.addMethod('PUT'); // PUT /product/{id}
- singleProduct.addMethod('DELETE'); // DELETE /product/{id}
-
- return singleProduct;
+ // Product microservices api gateway
+ // root name = product
+
+ // GET /product
+ // POST /product
+
+ // Single product with id parameter
+ // GET /product/{id}
+ // PUT /product/{id}
+ // DELETE /product/{id}
+
+ const apigw = new LambdaRestApi(this, 'productApi', {
+ restApiName: 'Product Service',
+ handler: productMicroservice,
+ proxy: false
+ });
+ 
+ const product = apigw.root.addResource('product');
+ product.addMethod('GET'); // GET /product
+ product.addMethod('POST'); // POST /product
+ 
+ const singleProduct = product.addResource('{id}'); // product/{id}
+ singleProduct.addMethod('GET'); // GET /product/{id}
+ singleProduct.addMethod('PUT'); // PUT /product/{id}
+ singleProduct.addMethod('DELETE'); // DELETE /product/{id}
  }
 
  private createBasketApi(basketMicroservice: IFunction) {
- 
  // Basket microservices api gateway
  // root name = basket
 
  // GET /basket
  // POST /basket
 
- // Single basket with userName parameter
+ // // Single basket with userName parameter - resource name = basket/{userName}
  // GET /basket/{userName}
  // DELETE /basket/{userName}
 
@@ -87,10 +83,14 @@ export class SwnApiGateway extends Construct {
  }
 
  private createOrderApi(orderingMicroservices: IFunction) {
- 
- // GET /order 
- // GET /order/{userName}
- 
+ // Ordering microservices api gateway
+ // root name = order
+
+ // GET /order
+ // GET /order/{userName}
+ // expected request : xxx/order/swn?orderDate=timestamp
+ // ordering ms grap input and query parameters and filter to dynamo db
+
  const apigw = new LambdaRestApi(this, 'orderApi', {
  restApiName: 'Order Service',
  handler: orderingMicroservices,
@@ -107,5 +107,4 @@ export class SwnApiGateway extends Construct {
 
  return singleOrder;
  }
-
 }

lib/aws-microservices-stack.ts

@@ -10,8 +10,8 @@ export class AwsMicroservicesStack extends Stack {
  constructor(scope: Construct, id: string, props?: StackProps) {
  super(scope, id, props);
 
- const database = new SwnDatabase(this, 'Database');
- 
+ const database = new SwnDatabase(this, 'Database'); 
+
  const microservices = new SwnMicroservices(this, 'Microservices', {
  productTable: database.productTable,
  basketTable: database.basketTable,
@@ -23,15 +23,15 @@ export class AwsMicroservicesStack extends Stack {
  basketMicroservice: microservices.basketMicroservice,
  orderingMicroservices: microservices.orderingMicroservice
  });
-
+ 
  const queue = new SwnQueue(this, 'Queue', {
  consumer: microservices.orderingMicroservice
  });
 
  const eventbus = new SwnEventBus(this, 'EventBus', {
  publisherFuntion: microservices.basketMicroservice,
- targetQueue: queue.orderQueue
- });
+ targetQueue: queue.orderQueue 
+ }); 
 
  }
 }

lib/database.ts

@@ -8,45 +8,50 @@ export class SwnDatabase extends Construct {
  public readonly basketTable: ITable;
  public readonly orderTable: ITable;
 
- constructor(scope: Construct, id: string){
+ constructor(scope: Construct, id: string) {
  super(scope, id);
-
- //product table
- this.productTable = this.createProductTable();
- //basket table
- this.basketTable = this.createBasketTable();
- //order table
- this.orderTable = this.createOrderTable(); 
+ 
+  //product table
+  this.productTable = this.createProductTable();
+  //basket table
+  this.basketTable = this.createBasketTable();
+  //order table
+  this.orderTable = this.createOrderTable(); 
  }
 
+ // Product DynamoDb Table Creation
  // product : PK: id -- name - description - imageFile - price - category
  private createProductTable() : ITable {
-  const dynamoTable  = new Table(this, 'product', {
-  partitionKey: {
-  name: 'id',
-  type: AttributeType.STRING
-  },
-  tableName: 'product',
-  removalPolicy: RemovalPolicy.DESTROY,
-  billingMode: BillingMode.PAY_PER_REQUEST
-  });
-  return dynamoTable;
+ const productTable = new Table(this, 'product', {
+ partitionKey: {
+ name: 'id',
+ type: AttributeType.STRING
+ },
+ tableName: 'product',
+ removalPolicy: RemovalPolicy.DESTROY,
+ billingMode: BillingMode.PAY_PER_REQUEST
+ });
+ return productTable;
  }
 
- // basket : PK: userName -- items (SET-MAP object) { quantity - color - price - productId - productName }
+ // Basket DynamoDb Table Creation
+ // basket : PK: userName -- items (SET-MAP object) 
+ // item1 - { quantity - color - price - productId - productName }
+ // item2 - { quantity - color - price - productId - productName }
  private createBasketTable() : ITable {
-  const basketTable = new Table(this, 'basket', {
-  partitionKey: {
-  name: 'userName',
-  type: AttributeType.STRING,
-  },
-  tableName: 'basket',
-  removalPolicy: RemovalPolicy.DESTROY,
-  billingMode: BillingMode.PAY_PER_REQUEST
-  });
-  return basketTable;
+ const basketTable = new Table(this, 'basket', {
+ partitionKey: {
+ name: 'userName',
+ type: AttributeType.STRING,
+ },
+ tableName: 'basket',
+ removalPolicy: RemovalPolicy.DESTROY,
+ billingMode: BillingMode.PAY_PER_REQUEST
+ });
+ return basketTable;
  }
 
+ // Order DynamoDb Table Creation
  // order : PK: userName - SK: orderDate -- totalPrice - firstName - lastName - email - address - paymentMethod - cardInfo
  private createOrderTable() : ITable {
  const orderTable = new Table(this, 'order', {
@@ -64,4 +69,6 @@ export class SwnDatabase extends Construct {
  });
  return orderTable;
  }
-}
+
+}
+

lib/eventbus.ts

@@ -1,38 +1,44 @@
-import { Construct } from "constructs";
-import { IFunction } from "aws-cdk-lib/aws-lambda";
 import { EventBus, Rule } from "aws-cdk-lib/aws-events";
-import { LambdaFunction, SqsQueue } from "aws-cdk-lib/aws-events-targets";
+import { SqsQueue } from "aws-cdk-lib/aws-events-targets";
+import { IFunction } from "aws-cdk-lib/aws-lambda";
 import { IQueue } from "aws-cdk-lib/aws-sqs";
+import { Construct } from "constructs";
 
 interface SwnEventBusProps {
- publisherFuntion: IFunction;
- targetQueue: IQueue;
+  publisherFuntion: IFunction;
+  targetQueue: IQueue;
 }
 
 export class SwnEventBus extends Construct {
- 
- constructor(scope: Construct, id: string, props: SwnEventBusProps) {
- super(scope, id);
 
- //eventbus
- const bus = new EventBus(this, 'SwnEventBus', {
- eventBusName: 'SwnEventBus'
- });
+ constructor(scope: Construct, id: string, props: SwnEventBusProps) {
+ super(scope, id);
+
+ //eventbus
+ const bus = new EventBus(this, 'SwnEventBus', {
+ eventBusName: 'SwnEventBus'
+ });
+ 
+ const checkoutBasketRule = new Rule(this, 'CheckoutBasketRule', {
+ eventBus: bus,
+ enabled: true,
+ description: 'When Basket microservice checkout the basket',
+ eventPattern: {
+ source: ['com.swn.basket.checkoutbasket'],
+ detailType: ['CheckoutBasket']
+ },
+ ruleName: 'CheckoutBasketRule'
+ });
 
- const checkoutBasketRule = new Rule(this, 'CheckoutBasketRule', {
- eventBus: bus,
- enabled: true,
- description: 'When Basket microservice checkout the basket',
- eventPattern: {
- source: ['com.swn.basket.checkoutbasket'],
- detailType: ['CheckoutBasket']
- },
- ruleName: 'CheckoutBasketRule'
- });
+ // // need to pass target to Ordering Lambda service
+ // checkoutBasketRule.addTarget(new LambdaFunction(props.targetFuntion)); 
+
+ // need to pass target to Ordering Lambda service
+ checkoutBasketRule.addTarget(new SqsQueue(props.targetQueue));
+ 
+ bus.grantPutEventsTo(props.publisherFuntion);
+ // AccessDeniedException - is not authorized to perform: events:PutEvents
 
- //checkoutBasketRule.addTarget(new LambdaFunction(props.targetFuntion)); // need to pass target to Ordering Lambda service
- checkoutBasketRule.addTarget(new SqsQueue(props.targetQueue)); // need to pass target to Ordering Lambda service
+ }
 
- bus.grantPutEventsTo(props.publisherFuntion);
- }
 }