Major refactor

src/resolvers/products-resolver.ts

@@ -1,22 +1,28 @@
-// (parent, args, ctx, info)
 import { IResolverObject } from 'graphql-tools';
 import { Api2DataSource } from '../datasources/api2-datasource';
 import { OrderAPI } from '../datasources/order-api';
 import { ProductAPI } from '../datasources/product-api';
+import { Product } from '../types/product-types';
+import { CategoryAPI } from '../datasources/category-api';
+import { Category } from '../types/category-types';
 
 const ProductBlacklist: IResolverObject = {
-  async market(parent, args, { dataSources }) {
+  async market(parent, _args, { dataSources }) {
     return (<OrderAPI>dataSources.orderApi).getMarketById(parent.marketId);
   },
 };
 
 const Product: IResolverObject = {
-  async categories({ id }, args, { dataSources }) {
-    return (<ProductAPI>dataSources.productApi).getCategories(id);
+  // (parent, args, ctx, info)
+  async categories({ id }, _args, { dataSources }): Promise<Array<Category>> {
+    return (<CategoryAPI>dataSources.categoryApi).getProductCategories(id);
   },
   async designer({ designerId }, args, { dataSources }) {
     return dataSources.designerApi.getDesignerById(designerId);
   },
+  async api1json({ id }, _args, { dataSources }): Promise<JSON> {
+    return dataSources.api1.getProduct(id);
+  },
 };
 
 const PrintProduct: IResolverObject = {
@@ -30,7 +36,11 @@ const PrintProduct: IResolverObject = {
   },
 };
 
-async function getProducts(_, { limit, visible, browsable }, { dataSources }) {
+async function getProducts(
+  _,
+  { limit, visible, browsable },
+  { dataSources },
+): Promise<Array<Product>> {
   return (<ProductAPI>dataSources.productApi).getProducts(
     limit,
     visible,
@@ -38,7 +48,7 @@ async function getProducts(_, { limit, visible, browsable }, { dataSources }) {
   );
 }
 
-async function getProduct(_, { id }, { dataSources }) {
+async function getProduct(_, { id }, { dataSources }): Promise<Product> {
   return (<ProductAPI>dataSources.productApi).getProduct(id);
 }