Merge pull request #21 from jonyw4/vendure-0.16

Update to Vendure 0.16

Author: jonyw4

.devcontainer/devcontainer.json

@@ -0,0 +1,27 @@
+{
+	"name": "Vendure Reviews Plugin",
+	"dockerComposeFile": [
+		"../docker-compose.yml"
+	],
+	"service": "dev",
+	"workspaceFolder": "/workspace",
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+	"extensions": [
+		"christian-kohler.path-intellisense",
+    "christian-kohler.npm-intellisense",
+    "github.vscode-pull-request-github",
+    "mhutchie.git-graph",
+    "dbaeumer.vscode-eslint",
+    "joelday.docthis",
+    "naumovs.color-highlight",
+    "esbenp.prettier-vscode",
+    "mikehanson.auto-barrel",
+    "streetsidesoftware.code-spell-checker",
+    "steoates.autoimport"
+	],
+	"forwardPorts": [3000, 3306],
+	"postCreateCommand": "yarn install",
+	// "remoteUser": "node"
+}

dev-server/config.ts

@@ -6,12 +6,10 @@ import {
 } from '@vendure/core';
 import { ReviewsStorePlugin, ReviewsProductPlugin } from '../src';
 
-const PORT = Number(process.env.PORT) || 3000;
-
 export const config: VendureConfig = {
   apiOptions: {
     hostname: '0.0.0.0',
-    port: PORT,
+    port: 3000,
     adminApiPath: 'admin-api',
     adminApiPlayground: {
       settings: {
@@ -35,11 +33,11 @@ export const config: VendureConfig = {
   dbConnectionOptions: {
     type: 'mysql',
     synchronize: true,
-    host: 'localhost',
+    host: 'host.docker.internal',
     port: 3306,
-    username: process.env.DB_USERNAME,
-    password: process.env.DB_PASSWORD,
-    database: process.env.DB_DATABASE,
+    username: 'root',
+    password: '',
+    database: 'vendure',
     logging: false
   },
   paymentOptions: {

docker-compose.yml

@@ -0,0 +1,23 @@
+version: "3"
+services:
+  database:
+    image: mysql:5.7
+    ports:
+      - "3306:3306"
+    volumes:
+      - /var/lib/mysql
+    environment:
+      MYSQL_DATABASE: vendure
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+  dev:
+    image: mcr.microsoft.com/vscode/devcontainers/typescript-node:0-12
+    command: /bin/sh -c "while sleep 1000; do :; done"
+    ports:
+      - "3000:3000"
+    volumes:
+      - .:/workspace:cached
+      - node_modules:/workspace/node_modules
+    depends_on:
+      - database
+volumes:
+  node_modules:

e2e/config/inject-order.ts

@@ -48,7 +48,7 @@ export class E2EInjectOrderPlugin implements OnVendureBootstrap {
     const completeOrder = await this.connection.getRepository(Order).save(
       new Order({
         code: 'T_2',
-        state: 'Fulfilled',
+        state: 'Delivered',
         active: false,
         customer: customers[1],
         lines: [],

package.json

@@ -26,10 +26,10 @@
     "dev-server:run:worker": "node -r ts-node/register dev-server/index-worker.ts"
   },
   "dependencies": {
-    "@vendure/ui-devkit": "0.15.0"
+    "@vendure/ui-devkit": "0.16.1"
   },
   "peerDependencies": {
-    "@vendure/core": ">=0.15.0"
+    "@vendure/core": ">=0.16.1"
   },
   "devDependencies": {
     "@commitlint/config-conventional": "9.1.1",
@@ -43,9 +43,9 @@
     "@types/jest": "26.0.4",
     "@typescript-eslint/eslint-plugin": "3.6.1",
     "@typescript-eslint/parser": "3.6.1",
-    "@vendure/core": "0.15.0",
-    "@vendure/create": "0.15.0",
-    "@vendure/testing": "0.15.0",
+    "@vendure/core": "0.16.1",
+    "@vendure/create": "0.16.1",
+    "@vendure/testing": "0.16.1",
     "codecov": "^3.7.2",
     "commitlint": "9.1.0",
     "concurrently": "5.3.0",
@@ -61,7 +61,7 @@
     "semantic-release": "17.1.1",
     "ts-jest": "26.1.3",
     "ts-node": "8.10.2",
-    "typescript": "3.8.3"
+    "typescript": "4.0.3"
   },
   "husky": {
     "hooks": {

src/api/resolvers/admin/review-product.resolver.spec.ts

@@ -44,8 +44,11 @@ export class ReviewProductAdminResolver {
 
   @Query()
   @Allow(Permission.ReadOrder)
-  async reviewProduct(@Args() { id }: QueryReviewProductArgs) {
-    return this.reviewProductService.findById(id);
+  async reviewProduct(
+    @Ctx() ctx: RequestContext,
+    @Args() { id }: QueryReviewProductArgs
+  ) {
+    return this.reviewProductService.findById(ctx, id);
   }
 
   @Query()
@@ -60,7 +63,7 @@ export class ReviewProductAdminResolver {
     @Ctx() ctx: RequestContext,
     @Args() args: MutationTransitionReviewProductToStateArgs
   ) {
-    const review = await this.reviewProductService.findById(args.id);
+    const review = await this.reviewProductService.findById(ctx, args.id);
     return this.reviewProductService.transitionToState(
       ctx,
       review,

src/api/resolvers/admin/review-product.resolver.ts

@@ -27,8 +27,11 @@ export class ReviewStoreAdminResolver {
 
   @Query()
   @Allow(Permission.ReadOrder)
-  async reviewStore(@Args() { id }: QueryReviewStoreArgs) {
-    return this.reviewStoreService.findById(id);
+  async reviewStore(
+    @Ctx() ctx: RequestContext,
+    @Args() { id }: QueryReviewStoreArgs
+  ) {
+    return this.reviewStoreService.findById(ctx, id);
   }
 
   @Query()
@@ -48,7 +51,7 @@ export class ReviewStoreAdminResolver {
     @Ctx() ctx: RequestContext,
     @Args() args: MutationTransitionReviewStoreToStateArgs
   ) {
-    const review = await this.reviewStoreService.findById(args.id);
+    const review = await this.reviewStoreService.findById(ctx, args.id);
     return this.reviewStoreService.transitionToState(
       ctx,
       review,