Merge pull request #14 from emenni/backendChanges

Backend changes

.vtexignore

@@ -0,0 +1,15 @@
+.DS_Store
+.git
+node_modules/
+node/node_modules/
+node/tslint.json
+react/node_modules/
+.vscode/
+.gitignore
+
+node/**/__tests__/**
+node/**/__mocks__/**
+node/**/__snapshots__/**
+node/**/*.test.js
+node/**/*.test.ts
+node/**/*.test.tsx

BackEnd-AWS/dreamscape-authorizer/index.js

@@ -8,7 +8,7 @@ exports.handler = async function(event, context, callback) {
     const { headers } = normalizeEvent(event); 
 
 
-    const authorization = headers.Authorization ?? headers.authorization
+    const authorization = headers['Proxy-Authorization'] ?? headers['Proxy-Authorization']
     if (authorization) {
         const responseGetUserVtex = await axios.get( `https://${process.env.account}.myvtex.com/api/vtexid/pub/authenticated/user?authToken=${authorization}`,{ // CHECK IF IS A VTEX AUTHENTICATED USER
             headers: {

BackEnd-AWS/dreamscape-suggestionsDelete/index.js

@@ -16,14 +16,14 @@ exports.handler = async event => {
     const params = {
         TableName: table,
         "Key": {
-            "email": pathParameters['email'],
-            "productId": pathParameters['productId']
+            "month": pathParameters['month'],
+            "orderId": pathParameters['orderId']
         }
     };
 
     try {
-        const dyn =  await dynamo.delete(params, () => {}).promise();
-        return response(200, `Record ${pathParameters['productId']} has been deleted`);
+        await dynamo.delete(params, () => {}).promise();
+        return response(200, `Record ${pathParameters['orderId']} has been deleted`);
     } catch (err) {
         console.error(err);
         return response(500, 'Somenthing went wrong');

BackEnd-AWS/dreamscape-suggestionsGet/index.js

@@ -19,14 +19,14 @@ exports.handler = async event => {
 
     try {
         let data = {};
-        if (pathParameters && pathParameters['email']) { // verify if has email
-            if(pathParameters['productId']) { // verify if has productId
+        if (pathParameters && pathParameters['month']) { // verify if has date
+            if(pathParameters['orderId']) { // verify if has month
                 data = await dynamo
                     .get({
                         ...params,
-                        Key: {// get data that has the email requested and productId
-                            email: pathParameters['email'],
-                            productId: pathParameters['productId']
+                        Key: {// get data that has the date requested and month
+                            month: pathParameters['month'],
+                            orderId: pathParameters['orderId'],
                         },
 
                     })
@@ -35,9 +35,9 @@ exports.handler = async event => {
                 data = await dynamo
                     .query({
                           ExpressionAttributeValues: {
-                            ':e': pathParameters['email'], // get data that has the email requested
+                            ':e': pathParameters['month'], // get data that has the date requested
                            },
-                         KeyConditionExpression: 'email = :e',
+                         KeyConditionExpression: 'month = :e',
                          TableName: table,
                     })
                     .promise();

BackEnd-AWS/dreamscape-suggestionsPost/index.js

@@ -15,23 +15,14 @@ exports.handler = async event => {
         const params = {
             TableName: table,
             Item: {
-                email: data.email,
-                productId: data.productId
+                month: data.month,
+                orderId: data.orderId,
+                date: data.date,
+                products: data.products
             },
         };
         await dynamo.put(params).promise();
-        let newSuggestion = {};
-        newSuggestion = await dynamo
-            .get({
-                TableName: table,
-                Key: {
-                    email: params.Item.email,
-                    productId: params.Item.productId
-                },
-
-            })
-            .promise();
-        return response(200, newSuggestion);
+        return response(200, `Record ${data.orderId} saved with success`);
     } catch (err) {
         console.error(err);
         return response(500, 'Somenthing went wrong');

BackEnd-AWS/dreamscape-suggestionsPut/index.js

@@ -14,23 +14,25 @@ exports.handler = async event => {
             throw new Error('No table name defined.');
         }
 
-        const { pathParameters } = normalizeEvent(event);
+        const { data,pathParameters } = normalizeEvent(event);
 
-        if(!pathParameters || !pathParameters['email'] || !pathParameters['productId']){
+        if(!pathParameters || !pathParameters['month'] || !pathParameters['orderId']){
             throw new Error('Invalid Request.');
         }
         const params = {
             TableName: table,
             Key: {
-                email: pathParameters['email'],
-                productId: pathParameters['productId']
+                month: pathParameters['month'],
+                orderId: pathParameters['orderId']
             },
-            UpdateExpression: 'set #a = :d',
+            UpdateExpression: 'set #a = :d, #f = :h',
             ExpressionAttributeNames: {
                 '#a': 'updated_at',
+                '#f': 'products'
             },
             ExpressionAttributeValues: {
-                ':d': new Date().toISOString()
+                ':d': new Date().toISOString(),
+                ':h': data.products
             },
         };
 

BackEnd-Vtex/graphql/schema.graphql

@@ -0,0 +1,4 @@
+type Query {
+    testHelloWorldResolver: String
+}
+

BackEnd-Vtex/manifest.json

@@ -7,7 +7,8 @@
   "categories": [],
   "dependencies": {},
   "builders": {
-    "node": "6.x"
+    "node": "6.x",
+    "graphql": "1.x"
   },
   "scripts": {
     "prereleasy": "bash lint.sh"
@@ -27,6 +28,13 @@
         "path": "/api/oms/pvt/orders/*"
       }
     },
+    {
+      "name": "outbound-access",
+      "attrs": {
+        "host": "portal.vtexcommercestable.com.br",
+        "path": "/api/oms/pvt/orders/*"
+      }
+    },
     {
       "name": "outbound-access",
       "attrs": {
@@ -56,11 +64,18 @@
         "path": "/api/profile-system/*"
       }
     },
+    {
+     "name": "outbound-access",
+    "attrs": {
+      "host": "2zxs9i4im3.execute-api.us-east-1.amazonaws.com",
+      "path": "/v1/*"
+      }
+    },
     {
       "name": "outbound-access",
       "attrs": {
-        "host": "2zxs9i4im3.execute-api.us-east-1.amazonaws.com",
-        "path": "/v1/*"
+        "host": "grhrvkk2k9.execute-api.us-east-1.amazonaws.com",
+        "path": "/default/*"
       }
     },
     {

BackEnd-Vtex/node/.vtexignore

@@ -0,0 +1,15 @@
+.DS_Store
+.git
+node_modules/
+node/node_modules/
+node/tslint.json
+react/node_modules/
+.vscode/
+.gitignore
+
+node/**/__tests__/**
+node/**/__mocks__/**
+node/**/__snapshots__/**
+node/**/*.test.js
+node/**/*.test.ts
+node/**/*.test.tsx

BackEnd-Vtex/node/clients/index.ts

@@ -2,6 +2,7 @@ import { IOClients } from "@vtex/api";
 import { OMS } from "@vtex/clients";
 import Suggestion from "./suggestion";
 import { Profile } from "./profile";
+import TestHelloWorld from "./testHelloWorld";
 
 // Extend the default IOClients implementation with our own custom clients.
 export class Clients extends IOClients {
@@ -14,4 +15,7 @@ export class Clients extends IOClients {
   public get profile() {
     return this.getOrSet('profile', Profile)
   }
+  public get testHelloWorld() {
+    return this.getOrSet('profile', TestHelloWorld)
+  }
 }

BackEnd-Vtex/node/clients/suggestion.ts

@@ -5,10 +5,9 @@ export default class Suggestion extends ExternalClient {
     super('https://2zxs9i4im3.execute-api.us-east-1.amazonaws.com/v1/suggestion', context, {
       ...options,
       headers: {
-        ...(options && options.headers),
-        Authorization: context.authToken
+        ...(options && options.headers)
       },
-      retries: 0
+      retries: 0,
     })
   }
 

BackEnd-Vtex/node/clients/testHelloWorld.ts

@@ -0,0 +1,19 @@
+import { ExternalClient, InstanceOptions, IOContext } from '@vtex/api'
+export default class TestHelloWorld extends ExternalClient {
+  constructor(context: IOContext, options?: InstanceOptions) {
+    super('https://grhrvkk2k9.execute-api.us-east-1.amazonaws.com', context, {
+      ...options,
+      headers: {
+        ...(options && options.headers)
+      },
+      retries: 0,
+    })
+  }
+
+  public go = () => {
+
+    return  this.http.get(`default/myFunctionName`)
+
+  }
+
+}

BackEnd-Vtex/node/index.ts

@@ -2,11 +2,13 @@ import type { ClientsConfig, ServiceContext, EventContext } from '@vtex/api'
 import { method, Service } from '@vtex/api'
 
 import { Clients } from './clients'
-import { suggestion } from './middlewares/suggestion'
+import { suggestionByMonth } from './middlewares/suggestionByMonth'
 import { suggestionAll } from './middlewares/suggestionAll'
 import { suggestionPut } from './middlewares/suggestionPut'
 import { suggestionPost } from './middlewares/suggestionPost'
-import { someStates } from './middlewares/someStates'
+//import { someStates } from './middlewares/someStates'
+import {  testHelloWorldResolver } from './resolvers/testHelloWorld'
+
 
 const TIMEOUT_MS = 800
 
@@ -23,8 +25,9 @@ const clients: ClientsConfig<Clients> = {
 declare global {
   type Context = ServiceContext<Clients>
   interface SuggestionData {
-    email: string
-    points: number
+    month: string
+    orderId: string
+    products: Record<string,any>[]
 
   }
   interface StatusChangeContext extends EventContext<Clients> {
@@ -38,23 +41,33 @@ declare global {
     }
   }
 }
-export default new Service({
+
+
+//export default new Service<Clients,  State, ParamsContext>({
+  export default new Service({
+  graphql: {
+    resolvers: {
+      Query: {
+        testHelloWorldResolver,
+      },
+    },
+  },
   clients,
   routes: {
-    suggestionOne: method({
-      GET: [suggestion],
+    suggestionByMonth: method({
+      GET: [suggestionByMonth],
     }),
     suggestionAll: method({
       GET: [suggestionAll],
     }),
     suggestionPut: method({
-      PATCH: [suggestionPut],
+      PUT: [suggestionPut],
     }),
     suggestionPost: method({
       POST: [suggestionPost],
     }),
   },
   events: {
-    someStates,
+    //someStates,
   },
 })