f/165476 moved function

Esri · Jan 26, 2021 · 97723e6 · 97723e6
1 parent c351ae0
commit 97723e6
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 57 deletions.
diff --git a/packages/downloads/src/portal/portal-request-download-metadata.ts b/packages/downloads/src/portal/portal-request-download-metadata.ts
@@ -7,9 +7,10 @@ import {
   ILayerDefinition
 } from "@esri/arcgis-rest-feature-layer";
 import { DownloadFormat, DownloadFormats } from "../download-format";
-import { urlBuilder, composeDownloadId, isRecentlyUpdated } from "../utils";
+import { urlBuilder, composeDownloadId } from "../utils";
 import { DownloadTarget } from "../download-target";
 import { DownloadStatus } from "../download-status";
+import { isRecentlyUpdated } from "./utils";
 
 enum ItemTypes {
   FeatureService = "Feature Service",

diff --git a/packages/downloads/src/portal/utils.ts b/packages/downloads/src/portal/utils.ts
@@ -0,0 +1,17 @@
+import { DownloadTarget } from "../download-target";
+
+const DOWNLOADS_LOCK_MS = 10 * 60 * 1000;
+
+/**
+ * @private
+ */
+export function isRecentlyUpdated(
+  target: DownloadTarget,
+  lastEditDate: number
+): boolean {
+  return (
+    target === "portal" &&
+    lastEditDate &&
+    new Date().getTime() - lastEditDate <= DOWNLOADS_LOCK_MS
+  );
+}
diff --git a/packages/downloads/src/utils.ts b/packages/downloads/src/utils.ts
@@ -1,7 +1,3 @@
-import { DownloadTarget } from "./download-target";
-
-const DOWNLOADS_LOCK_MS = 10 * 60 * 1000;
-
 interface IQueryParams {
   [key: string]: string;
 }
@@ -53,17 +49,3 @@ export function composeDownloadId(params: IDownloadIdParams): string {
   const { datasetId, format, spatialRefId, geometry, where } = params;
   return `${datasetId}:${format}:${spatialRefId}:${geometry}:${where}`;
 }
-
-/**
- * @private
- */
-export function isRecentlyUpdated(
-  target: DownloadTarget,
-  lastEditDate: number
-): boolean {
-  return (
-    target === "portal" &&
-    lastEditDate &&
-    new Date().getTime() - lastEditDate <= DOWNLOADS_LOCK_MS
-  );
-}
diff --git a/packages/downloads/test/portal/utils.test.ts b/packages/downloads/test/portal/utils.test.ts
@@ -0,0 +1,38 @@
+import { DownloadTarget } from "../../src/download-target";
+import { isRecentlyUpdated } from "../../src/portal/utils";
+
+describe("isRecentlyUpdated", () => {
+  it('should return false if target is not "portal", even if data was recently updated', done => {
+    const targetOne: DownloadTarget = undefined;
+    const targetTwo: DownloadTarget = "hub";
+    const targetThree: DownloadTarget = "enterprise";
+    const lastEditDate: number = new Date().getTime();
+
+    expect(isRecentlyUpdated(targetOne, lastEditDate)).toBeFalsy();
+    expect(isRecentlyUpdated(targetTwo, lastEditDate)).toBeFalsy();
+    expect(isRecentlyUpdated(targetThree, lastEditDate)).toBeFalsy();
+    done();
+  });
+
+  it("should return false for any target if data was recently updated", done => {
+    const targetOne: DownloadTarget = undefined;
+    const targetTwo: DownloadTarget = "hub";
+    const targetThree: DownloadTarget = "enterprise";
+    const targetFour: DownloadTarget = "portal";
+    const lastEditDate: number = 1000;
+
+    expect(isRecentlyUpdated(targetOne, lastEditDate)).toBeFalsy();
+    expect(isRecentlyUpdated(targetTwo, lastEditDate)).toBeFalsy();
+    expect(isRecentlyUpdated(targetThree, lastEditDate)).toBeFalsy();
+    expect(isRecentlyUpdated(targetFour, lastEditDate)).toBeFalsy();
+    done();
+  });
+
+  it('should return true only if target is "portal" and if data was recently updated', done => {
+    const target: DownloadTarget = "portal";
+    const lastEditDate: number = new Date().getTime();
+
+    expect(isRecentlyUpdated(target, lastEditDate)).toBeTruthy();
+    done();
+  });
+});
diff --git a/packages/downloads/test/utils.test.ts b/packages/downloads/test/utils.test.ts
@@ -1,5 +1,4 @@
-import { DownloadTarget } from "../src/download-target";
-import { urlBuilder, composeDownloadId, isRecentlyUpdated } from "../src/utils";
+import { urlBuilder, composeDownloadId } from "../src/utils";
 
 describe("utils", () => {
   describe("urlBuilder", () => {
@@ -54,40 +53,4 @@ describe("utils", () => {
       done();
     });
   });
-
-  describe("isRecentlyUpdated", () => {
-    it('should return false if target is not "portal", even if data was recently updated', done => {
-      const targetOne: DownloadTarget = undefined;
-      const targetTwo: DownloadTarget = "hub";
-      const targetThree: DownloadTarget = "enterprise";
-      const lastEditDate: number = new Date().getTime();
-
-      expect(isRecentlyUpdated(targetOne, lastEditDate)).toBeFalsy();
-      expect(isRecentlyUpdated(targetTwo, lastEditDate)).toBeFalsy();
-      expect(isRecentlyUpdated(targetThree, lastEditDate)).toBeFalsy();
-      done();
-    });
-
-    it("should return false for any target if data was recently updated", done => {
-      const targetOne: DownloadTarget = undefined;
-      const targetTwo: DownloadTarget = "hub";
-      const targetThree: DownloadTarget = "enterprise";
-      const targetFour: DownloadTarget = "portal";
-      const lastEditDate: number = 1000;
-
-      expect(isRecentlyUpdated(targetOne, lastEditDate)).toBeFalsy();
-      expect(isRecentlyUpdated(targetTwo, lastEditDate)).toBeFalsy();
-      expect(isRecentlyUpdated(targetThree, lastEditDate)).toBeFalsy();
-      expect(isRecentlyUpdated(targetFour, lastEditDate)).toBeFalsy();
-      done();
-    });
-
-    it('should return true only if target is "portal" and if data was recently updated', done => {
-      const target: DownloadTarget = "portal";
-      const lastEditDate: number = new Date().getTime();
-
-      expect(isRecentlyUpdated(target, lastEditDate)).toBeTruthy();
-      done();
-    });
-  });
 });