Add product

queries.graphql

@@ -65,8 +65,18 @@
 {
   order(id: 588274) {
     id
+    marketObject {
+      id
+      name
+      vat
+      currency
+      priceAdjustment
+    }
     rows {
       id
+      order {
+        id
+      }
       insertedDate
       orderId
       productId

src/datasources/order-api.ts

@@ -1,6 +1,12 @@
 import { SQLDataSource } from 'datasource-sql';
 import { camelcase } from 'stringcase';
-import { Address, ContactInformation, Order, OrderRow } from './order-types';
+import {
+  Address,
+  ContactInformation,
+  Market,
+  Order,
+  OrderRow,
+} from './order-types';
 import { Maybe } from './types';
 
 const MINUTE = 60;
@@ -9,6 +15,24 @@ export class OrderAPI extends SQLDataSource {
     super(config);
   }
 
+  async getMarketById(id: number): Promise<Market> {
+    return await this.knex
+      .select('*')
+      .from('markets')
+      .where('id', id)
+      .first()
+      .cache(MINUTE);
+  }
+
+  async getMarketByName(name: string): Promise<Market> {
+    return await this.knex
+      .select('*')
+      .from('markets')
+      .where('name', name)
+      .first()
+      .cache(MINUTE);
+  }
+
   async getAddress(addressId: number): Promise<Maybe<Address>> {
     const row = await this.knex
       .select('*')
@@ -103,7 +127,6 @@ export class OrderAPI extends SQLDataSource {
       }
       const orderRow = details.reduce((obj, item) => {
         obj[camelcase(fields[item.fieldid])] = item.value;
-        obj['insertedDate'] = item.inserted;
         return obj;
       }, {});
 
@@ -120,6 +143,7 @@ export class OrderAPI extends SQLDataSource {
 }
 
 /**
+ * row
 {
     printId: '73963',
     inserted: 2021-02-04T10:11:41.093Z,

src/datasources/order-types.ts

@@ -1,3 +1,11 @@
+export interface Market {
+  id: number;
+  name: string;
+  vat: number;
+  currency: string;
+  priceAdjustment: number;
+}
+
 export interface Address {
   id: number;
   firstname: string;
@@ -71,7 +79,7 @@ export interface Order {
 
 export interface OrderRow {
   id: number;
-  insertedDate: Date;
+  inserted: Date;
   orderId: number;
   productId: number;
   productGroup: string;

src/datasources/product-api.ts

@@ -39,21 +39,29 @@ export class ProductAPI extends SQLDataSource {
     limit: Maybe<number>,
     visible: Maybe<boolean>,
     browsable: Maybe<boolean>,
-  ): Promise<Product> {
+  ): Promise<Array<Product>> {
-    // console.log(limit, browsable, visible);
     limit = limit ?? 100;
     const query = sql.products(limit, visible, browsable);
 
-    const data = await this.knex.raw(query).then((data) =>
+    return await this.knex.raw(query).then((data) =>
       data.rows.map((row) => {
         row.blacklisting = this.getBlacklisting(row);
         row.printProducts = this.getPrintProducts(row);
         return row;
       }),
     );
+  }
 
-    // console.log(JSON.stringify(data, null, 2));
+  async getProduct(id: number): Promise<Maybe<Product>> {
+    const query = sql.product(id);
 
-    return data;
+    const res = await this.knex.raw(query).then((data) =>
+      data.rows.map((row) => {
+        row.blacklisting = this.getBlacklisting(row);
+        row.printProducts = this.getPrintProducts(row);
+        return row;
+      }),
+    );
+    return res.find(Boolean);
   }
 }

src/datasources/sql/products-sql.ts

@@ -2,14 +2,9 @@ import { Maybe } from '../types';
 
 // Get syntax highlighting with vscode by installing "Comment tagged templates2
 
-export function products(
+const baseQuery = /* sql */ `
-  limit: number = 100,
-  visible: Maybe<boolean>,
-  browsable: Maybe<boolean>,
-) {
-  const query = /* sql */ `
 
-  SELECT products.productid as id,
+SELECT products.productid as id,
   products.path,
   products.visible,
   products.browsable,
@@ -50,6 +45,16 @@ export function products(
   ) FROM product_blacklist WHERE product_blacklist.product_id = products.productid
   ) AS blacklisting
   FROM "product-products" products
+  `;
+
+export function products(
+  limit: number = 100,
+  visible: Maybe<boolean>,
+  browsable: Maybe<boolean>,
+) {
+  return (
+    baseQuery +
+    /* sql */ `
   ${
     visible != null
       ? /* sql */ `
@@ -58,7 +63,15 @@ export function products(
       : ``
   }
 LIMIT ${limit}
-`;
+`
+  );
+}
 
-  return query;
+export function product(id: number) {
+  return (
+    baseQuery +
+    /* sql */ `
+      WHERE products.productid = ${id}
+`
+  );
 }

src/index.ts

@@ -6,7 +6,6 @@ import knexStringcase from 'knex-stringcase';
 import { dbConfig } from './config';
 import { typeDefs } from './schema';
 import resolvers from './resolvers';
-
 import { OrderAPI } from './datasources/order-api';
 import { ProductAPI } from './datasources/product-api';
 

src/resolvers/datetime-type.ts

@@ -1,6 +1,7 @@
 import { GraphQLScalarType } from 'graphql';
 import { Kind } from 'graphql/language';
 
+// possible switch to https://github.com/Urigo/graphql-scalars
 export const DateTimeScalar = new GraphQLScalarType({
   name: 'DateTime',
   description: 'Date custom scalar type',

src/resolvers/index.ts

@@ -1,12 +1,12 @@
-import orders, { ContactInformation, Order } from './orders-resolver';
+import { orderQueryTypeDefs, orderTypeDefs } from './orders-resolver';
-import products from './products-resolver';
+import { productQueryTypeDefs, productTypeDefs } from './products-resolver';
 import { DateTimeScalar } from './datetime-type';
 
 const resolvers = {
-  Query: { ...orders, ...products },
+  Query: { ...orderQueryTypeDefs, ...productQueryTypeDefs },
   DateTime: DateTimeScalar,
-  ContactInformation,
+  ...orderTypeDefs,
-  Order,
+  ...productTypeDefs,
 };
 
 export default resolvers;

src/resolvers/orders-resolver.ts

@@ -1,16 +1,25 @@
 import { IResolverObject } from 'graphql-tools';
 
-export const ContactInformation: IResolverObject = {
+const ContactInformation: IResolverObject = {
   // (parent, args, ctx, info)
   async address({ addressId }, args, { dataSources }) {
     return dataSources.orderApi.getAddress(addressId);
   },
 };
 
-export const Order: IResolverObject = {
+const Order: IResolverObject = {
   async rows({ id }, args, { dataSources }) {
     return dataSources.orderApi.getOrderRows(id);
   },
+  async marketObject({ market }, args, { dataSources }) {
+    return dataSources.orderApi.getMarketByName(market);
+  },
+};
+
+const OrderRow: IResolverObject = {
+  async order(parent, args, { dataSources }) {
+    return dataSources.orderApi.getOrder(parent.orderId);
+  },
 };
 
 async function getOrders(_, __, { dataSources }) {
@@ -21,9 +30,13 @@ async function getOrder(_, { id }, { dataSources }) {
   return dataSources.orderApi.getOrder(id);
 }
 
-const orders = {
+export const orderTypeDefs = {
+  ContactInformation,
+  Order,
+  OrderRow,
+};
+
+export const orderQueryTypeDefs = {
   orders: getOrders,
   order: getOrder,
 };
-
-export default orders;

src/resolvers/products-resolver.ts

@@ -1,7 +1,25 @@
 // (parent, args, ctx, info)
-const products = {
+import { IResolverObject } from 'graphql-tools';
-  products: (_, { limit, visible, browsable }, { dataSources }) =>
+
-    dataSources.productApi.getProducts(limit, visible, browsable),
+const ProductBlacklist: IResolverObject = {
+  async market(parent, args, { dataSources }) {
+    return dataSources.orderApi.getMarketById(parent.marketId);
+  },
 };
 
-export default products;
+async function getProducts(_, { limit, visible, browsable }, { dataSources }) {
+  return dataSources.productApi.getProducts(limit, visible, browsable);
+}
+
+async function getProduct(_, { id }, { dataSources }) {
+  return dataSources.productApi.getProduct(id);
+}
+
+export const productTypeDefs = {
+  ProductBlacklist,
+};
+
+export const productQueryTypeDefs = {
+  products: getProducts,
+  product: getProduct,
+};

src/schema.ts

@@ -7,6 +7,15 @@ const typeDefs = gql`
     orders: [Order]
     order(id: ID!): Order
     products(limit: Int, visible: Boolean, browsable: Boolean): [Product]
+    product(id: Int!): Product
+  }
+
+  type Market {
+    id: ID!
+    name: String
+    vat: Float
+    currency: String
+    priceAdjustment: Float
   }
 
   type Address {
@@ -79,12 +88,13 @@ const typeDefs = gql`
     billingAddressId: Int
     deliveryAddressId: Int
     rows: [OrderRow]
+    marketObject: Market
   }
 
   type OrderRow {
     id: ID!
     order: Order
-    insertedDate: DateTime
+    inserted: DateTime
     orderId: Int
     productId: Int
     productGroup: String
@@ -100,6 +110,11 @@ const typeDefs = gql`
     pwintySku: String
   }
 
+  type Category {
+    id: ID!
+    name: String
+  }
+
   type Product {
     id: ID!
     path: String!
@@ -126,6 +141,7 @@ const typeDefs = gql`
     groupId: Int!
     group: ProductGroup!
     marketId: Int!
+    market: Market!
     inserted: DateTime!
     updated: DateTime!
   }
@@ -141,38 +157,13 @@ const typeDefs = gql`
 
 export { typeDefs };
 /**
-schema {
-  query: Query
-}
 
-type Address {
-  id: ID!
-  firstname: String
-  lastname: String
-  recipientName: String
-  companyname: String
-  address1: String
-  address2: String
-  countryCode: String
-  city: String
-  zipcode: String
-  stateCountyOrRegion: String
-}
 
 type Category {
   id: ID!
   name: String
 }
 
-type ContactInformation {
-  email: String
-  phone: String
-  address: Address
-}
-
-scalar Date
-
-scalar DateTime
 
 type Designer {
   id: ID!
@@ -180,98 +171,26 @@ type Designer {
   orderRows(fromDate: Date, toDate: Date): [OrderRow]
 }
 
-enum Group {
-  PHOTO_WALLPAPER
-  CANVAS
-  WALLPAPER
-  DO_IT_YOURSELF_FRAME
-  DESIGNER_WALLPAPER
-  POSTER
-  FRAMED_PRINT
-}
-
-scalar JSONString
-
-type Market {
-  id: ID!
-  name: String
-}
-
-type Order {
-  id: ID!
-  insertedDate: DateTime!
-  paid: Boolean!
-  confirmed: Boolean!
-  delivered: Boolean!
-  canceled: Boolean!
-  countryCode: String!
-  locale: String!
-  market: String!
-  currency: String
-  contractCustomerId: Int
-  exchangeRateEUR: Float
-  language: String
-  pwintyId: Int
-  email: String
-  phone: String
-  rows: [OrderRow]
-  billingInformation: ContactInformation
-  deliveryInformation: ContactInformation
-}
-
-type OrderRow {
-  id: ID!
-  order: Order
-  insertedDate: DateTime
-  orderId: Int
-  productId: Int
-  productGroup: String
-  artNo: String
-  path: String
-  name: String
-  price: Float
-  designerId: String
-  commissionAmount: String
-  status: String
-  pwintyImageId: Int
-  frameColor: String
-  pwintySku: String
-  json: JSONString
-}
-
 type PrintProduct {
-  id: ID!
-  group: Group!
  insertedDate: DateTime!
   updatedDate: DateTime
 }
 
 type Product {
-  id: ID!
-  path: String!
-  visible: Boolean
-  browsable: Boolean
-  insertedDate: DateTime!
-  updatedDate: DateTime!
   categories: [Category]
   designer: Designer
-  printProducts: [PrintProduct]
+  insertedDate: DateTime!
-  blacklisting: [ProductBlacklist]
+  updatedDate: DateTime
 }
 
 type ProductBlacklist {
-  id: ID!
-  group: Group!
-  marketId: String!
-  insertedDate: DateTime!
-  updatedDate: DateTime!
   market: Market
+  insertedDate: DateTime!
+  updatedDate: DateTime
 }
 
 type Query {
-  products(limit: Int, visible: Boolean, browsable: Boolean): [Product]
   product(id: Int!): Product
-  order(id: Int!): Order
   designer(id: Int!): Designer
   designers: [Designer]
 }