Revert "Add publishing date (#107)" (#108)

Dockerfile

@@ -8,7 +8,6 @@ COPY . app/
 WORKDIR /app
 # Set node env
 ENV NODE_ENV=production
-ENV NEW_RELIC_NO_CONFIG_FILE=true
 # Installs npm dependencies on container
 RUN npm ci
 # Command container will actually run when called

src/datasources/product-api.ts

@@ -155,7 +155,6 @@ export class ProductAPI extends BaseSQLDataSource {
   }
 
   createProductFromRow(row: any) {
-    row.publishingDate = row.publishing_date;
     row.blacklisting = this.getBlacklisting(row);
     row.printProducts = this.getPrintProducts(row);
     row.type = this.getProductTypes(row);
@@ -431,15 +430,6 @@ export class ProductAPI extends BaseSQLDataSource {
       promises.push(promise);
     }
 
-    const pd = info.publishingDate;
-    const publishingDate = new Date(
-      pd.getFullYear(),
-      pd.getMonth(),
-      pd.getDate(),
-      0,
-      0,
-      0,
-    );
     promises.push(
       this.knex
         .table('product-products')
@@ -448,7 +438,6 @@ export class ProductAPI extends BaseSQLDataSource {
           browsable: info.browsable ? 1 : 0,
           visible: info.visible ? 1 : 0,
           designerid: info.designerId ?? null,
-          publishingDate: publishingDate,
           ref1: info.ref1,
           ref2: info.ref2,
           ref3: info.ref3,
@@ -478,32 +467,6 @@ export class ProductAPI extends BaseSQLDataSource {
     return Promise.all(promises);
   }
 
-  /**
-   * @function productPublishing
-   * @description updates a products publishing
-   */
-  async productPublishing(productId: number, date: Date) {
-    return this.knex
-      .table('product-products')
-      .update({
-        publishing_date: date,
-      })
-      .where('productid', productId);
-  }
-
-  /**
-   * @function massUpdatePublishingDate
-   * @description Mass update publishing date
-   */
-  async massUpdatePublishingDate(productIds: Array<number>, date: Date) {
-    return this.knex
-      .table('product-products')
-      .update({
-        publishing_date: date,
-      })
-      .whereIn('productid', productIds);
-  }
-
   /**
    * @function massUpdatePublishing
    * @description Mass update visible and browsable

src/datasources/sql/products-sql.ts

@@ -12,7 +12,6 @@ SELECT products.productid AS id,
   products.designerid,
   products.inserted,
   products.updated,
-  products.publishing_date,
   products.ref1,
   products.ref2,
   products.ref3,
@@ -90,7 +89,7 @@ export function products(input: ProductsFilterInput) {
   AND products.browsable = ${filter?.browsable ? '1' : '0'}`
       : ``
   }
-ORDER BY products.publishing_date DESC
+ORDER BY products.inserted DESC
 LIMIT ${limit} OFFSET ${offset}
 `
   );

src/index.ts

@@ -1,4 +1,4 @@
-const newrelic = require('newrelic');
+require('newrelic');
 import dotenv from 'dotenv';
 dotenv.config();
 
@@ -90,30 +90,20 @@ const context = async ({ req }) => {
 };
 
 async function main() {
-  try {
+  const server = new ApolloServer({
-    const server = new ApolloServer({
+    typeDefs,
-      typeDefs,
+    resolvers,
-      resolvers,
+    dataSources,
-      dataSources,
+    context,
-      context,
+    introspection: true,
-      introspection: true,
+    plugins: [newRelicPlugin],
-      plugins: [newRelicPlugin],
+  });
-      formatError: (err) => {
-        console.log('Error (fmt):', err);
-        newrelic.noticeError(err);
-        return err;
-      },
-    });
 
-    await server.listen();
+  await server.listen();
 
-    console.log(
+  console.log(
-      'Server is running on http://localhost:4000, ',
+    'Server is running on http://localhost:4000, ',
-      process.env.ENVIRONMENT_NAME,
+    process.env.ENVIRONMENT_NAME,
-    );
+  );
-  } catch (ex) {
-    newrelic.noticeError(ex);
-    console.error('Got terminal exception:', ex);
-  }
 }
 main();

src/resolvers/products-resolver.ts

@@ -476,22 +476,4 @@ export const productMutationTypeDefs = {
       value: 'OK',
     };
   },
-  /**
-   * @function massUpdatePublishing
-   * @description Mutate the Publishing for products
-   */
-  async massUpdatePublishingDate(
-    _,
-    { productIds, date },
-    { dataSources, auth },
-  ) {
-    checkAccess(['products.write'], auth);
-    await (<ProductAPI>dataSources.productApi).massUpdatePublishingDate(
-      productIds,
-      date,
-    );
-    return {
-      value: 'OK',
-    };
-  },
 };

src/schema.graphql

@@ -236,7 +236,6 @@ type Product {
   browsable: Boolean!
   inserted: DateTime!
   updated: DateTime
-  publishingDate: DateTime!
   printProducts: [PrintProduct]
   blacklisting: [ProductBlacklist]
   categories: [Category]
@@ -406,7 +405,6 @@ input ProductInfoInput {
   designerId: Int
   browsable: Boolean!
   visible: Boolean!
-  publishingDate: DateTime!
   printFileWidth: Int!
   printFileHeight: Int!
   printFileDpi: Int!
@@ -437,9 +435,8 @@ type IdNumberResult {
 }
 
 type Mutation {
-  """
+
-  Product
+  """ Product """
-  """
   addProduct(name: String!, batch: String): Product
   productInfo(productId: Int!, info: ProductInfoInput!): Product
   productWallpaperType(
@@ -450,9 +447,8 @@ type Mutation {
     productId: Int!
     markets: [ProductBlacklistingInput]
   ): Product
-  """
+
-  Product Image
+  """ Product Image """
-  """
   productFocusPoint(
     productId: Int!
     focusXpoint2: Float!
@@ -469,32 +465,22 @@ type Mutation {
     height: Int!
   ): String
 
-  """
+  """ Product Relations """
-  Product Relations
-  """
   addRelatedProducts(productId: Int!, articleNumbers: [String]!): Product
   removeRelatedProducts(productId: Int!, relatedProductIds: [Int]!): Product
 
-  """
+  """ Product Categories """
-  Product Categories
-  """
   addCategoriesToProduct(productId: Int!, categoryIds: [Int]!): Product
   removeCategoriesFromProduct(productId: Int!, categoryIds: [Int]!): Product
 
-  """
+  """ Product Keywords """
-  Product Keywords
-  """
   productKeywords(productId: Int!, keywordIds: [Int]): Product
   addKeyword(name: String!, type: KeywordType): Keyword
 
-  """
+  """ Product Other """
-  Product Other
-  """
   updateProductComments(productId: Int!, comments: String!): Product
 
-  """
+  """ Printproducts """
-  Printproducts
-  """
   productGroup(productId: Int!, groupIds: [Int]): Product
   productGroupInteriors(productId: Int!, groupId: Int!, uris: [String]): Product
   addOwnInteriorToPrintProduct(
@@ -510,9 +496,7 @@ type Mutation {
     border: BorderType!
   ): PrintProductDefaults
 
-  """
+  """ Mass Update """
-  Mass Update
-  """
   massUpdatePublishing(
     productIds: [Int]!
     visible: Boolean
@@ -522,5 +506,4 @@ type Mutation {
     productIds: [Int]!
     markets: [ProductBlacklistingInput]
   ): StringResult
-  massUpdatePublishingDate(productIds: [Int]!, date: DateTime!): StringResult
 }

src/types/product-types.ts

@@ -16,7 +16,6 @@ export interface ProductInfoInput {
   designerId: Maybe<number>;
   browsable: boolean;
   visible: boolean;
-  publishingDate: Date;
   printFileWidth: number;
   printFileHeight: number;
   printFileDpi: number;