[TASK] Flatten lib (ericyd#123)

* place logging in main lib directory

* update timer constant naming

lib/FileService.ts

@@ -12,7 +12,7 @@ import MimeType from './MimeType';
 import Constants from './Constants';
 import ErrorMessages from './ErrorMessages';
 import FeatureFlag from './FeatureFlag';
-import Logging from './util/Logging';
+import Logging from './Logging';
 
 export default class FileService {
   gDriveService: GDriveService;

lib/util/Logging.ts → lib/Logging.ts

@@ -1,6 +1,6 @@
-import FileService from '../FileService';
-import Util from '../Util';
-import ErrorMessages from '../ErrorMessages';
+import FileService from './FileService';
+import Util from './Util';
+import ErrorMessages from './ErrorMessages';
 
 // would be nice to call this "Logger" but that already exists in the Google Apps Script namespace
 export default class Logging {

lib/Timer.ts

@@ -10,9 +10,13 @@ export default class Timer {
   // https://developers.google.com/apps-script/guides/services/quotas
   static MAX_RUNTIME_PER_DAY: number = 88 * 1000 * 60;
   static MAX_RUNTIME: number = 4.7 * 1000 * 60;
+
   // durations used for setting Triggers
-  static oneDay: number = 24 * 60 * 60 * 1000;
-  static sixMinutes: number = 6.2 * 1000 * 60;
+  static SLEEP_TIME_ONE_DAY: number = 24 * 60 * 60 * 1000;
+
+  // Trigger time includes runtime and sleep time (1.5 mins) because the trigger
+  // is set at the beginning of execution, not the end.
+  static TRIGGER_TIME: number = Timer.MAX_RUNTIME + (1.5 * 1000 * 60);
 
   START_TIME: number;
   runtime: number;
@@ -46,8 +50,8 @@ export default class Timer {
    */
   calculateTriggerDuration(properties: Properties): number {
     return properties.checkMaxRuntime()
-      ? Timer.oneDay
-      : Timer.sixMinutes - this.runtime;
+      ? Timer.SLEEP_TIME_ONE_DAY
+      : Timer.TRIGGER_TIME - this.runtime;
   }
 
   static now(): number {

lib/TriggerService.ts

@@ -4,7 +4,7 @@
 
 import Util from './Util';
 import Timer from './Timer';
-import Logging from './util/Logging';
+import Logging from './Logging';
 
 export default class TriggerService {
   /**
@@ -14,7 +14,7 @@ export default class TriggerService {
   static createTrigger(duration: number): void {
     // default is 6.2 minutes from now
     // Timer will stop execution after 4.7 minutes, so this gives about 1.5 minutes buffer
-    duration = duration || Timer.sixMinutes;
+    duration = duration || Timer.TRIGGER_TIME;
     var trigger = ScriptApp.newTrigger('copy')
       .timeBased()
       .after(duration)

lib/Util.ts

@@ -9,7 +9,7 @@ import GDriveService from './GDriveService';
 import Timer from './Timer';
 import Constants from './Constants';
 import ErrorMessages from './ErrorMessages';
-import Logging from './util/Logging';
+import Logging from './Logging';
 
 export default class Util {
   /**

lib/main.ts

@@ -9,7 +9,7 @@ import Properties from './Properties';
 import Timer from './Timer';
 import TriggerService from './TriggerService';
 import ErrorMessages from './ErrorMessages';
-import Logging from './util/Logging';
+import Logging from './Logging';
 
 /**
  * Copy folders and files from source to destination.

package.json

@@ -38,7 +38,7 @@
   },
   "scripts": {
     "pretest": "tsc lib/*.ts --module commonjs || true",
-    "posttest": "rm lib/*.js && rm lib/**/*.js",
+    "posttest": "rm lib/*.js",
     "test": "nyc mocha --grep formatting --invert --compilers js:babel-core/register",
     "prettier-test": "mocha test/formatting/prettier.test.js --compilers js:babel-core/register",
     "watch": "gulp watch",

test/FileService.test.js

@@ -5,7 +5,7 @@ import Timer from '../lib/Timer';
 import Properties from '../lib/Properties';
 import Constants from '../lib/Constants';
 import FeatureFlag from '../lib/FeatureFlag';
-import Logging from '../lib/util/Logging';
+import Logging from '../lib/Logging';
 const PropertiesService = require('./mocks/PropertiesService');
 const assert = require('assert');
 const fs = require('fs');

test/Timer.test.js

@@ -64,7 +64,7 @@ describe('timers', function() {
     const duration = this.timer.calculateTriggerDuration(properties);
     assert.equal(
       duration,
-      Timer.sixMinutes,
+      Timer.TRIGGER_TIME,
       'duration not equal to six minutes'
     );
   });
@@ -77,7 +77,7 @@ describe('timers', function() {
     const duration = this.timer.calculateTriggerDuration(properties);
     assert.equal(
       duration,
-      Timer.sixMinutes - runtime,
+      Timer.TRIGGER_TIME - runtime,
       'duration not equal to six minutes'
     );
   });
@@ -86,6 +86,6 @@ describe('timers', function() {
     const properties = new Properties();
     properties.incrementTotalRuntime(Timer.MAX_RUNTIME_PER_DAY);
     const duration = this.timer.calculateTriggerDuration(properties);
-    assert.equal(duration, Timer.oneDay, 'duration not equal to one day');
+    assert.equal(duration, Timer.SLEEP_TIME_ONE_DAY, 'duration not equal to one day');
   });
 });

test/TriggerService.test.js

@@ -31,7 +31,7 @@ describe('TriggerService', function() {
       const triggerId = JSON.parse(
         PropertiesService.getUserProperties().getProperty('triggerId')
       );
-      assert.equal(triggerId.duration, Timer.sixMinutes);
+      assert.equal(triggerId.duration, Timer.TRIGGER_TIME);
       assert.equal(triggerId.basis, 'time');
       assert.equal(triggerId.created, true);
       assert.equal(triggerId.name, 'copy');

test/Util.test.js

@@ -4,7 +4,7 @@ import Timer from '../lib/Timer';
 import TriggerService from '../lib/TriggerService';
 import Properties from '../lib/Properties';
 import Constants from '../lib/Constants';
-import Logging from '../lib/util/Logging';
+import Logging from '../lib/Logging';
 const userProperties = require('./mocks/PropertiesService').getUserProperties();
 const sinon = require('sinon');
 const assert = require('assert');
@@ -66,7 +66,7 @@ describe('Util', function() {
       const stubSaveState = sinon.stub(Util, 'saveState');
       const stubDeleteTrigger = sinon.stub(TriggerService, 'deleteTrigger');
       const timer = new Timer();
-      this.clock.tick(Timer.sixMinutes);
+      this.clock.tick(Timer.TRIGGER_TIME);
       timer.update(userProperties);
       const fileList = [{ id: 1 }, { id: 2 }, { id: 3 }];
       const properties = new Properties();

test/toHumanReadable.test.js

@@ -1,5 +1,5 @@
 import * as assert from 'assert';
-import Logging from '../lib/util/Logging';
+import Logging from '../lib/Logging';
 
 describe('bytesToHumanReadable', function() {
   it('should return bytes when less than 1 KB', () => {