Merge pull request #5 from paulpopus/fix/tests-and-error-on-website-stats

Fix/tests and error on website stats

Author: mikecao

.env.example

@@ -0,0 +1,4 @@
+UMAMI_API_KEY=
+UMAMI_API_CLIENT_ENDPOINT=https://api.umami.is/v1
+
+UMAMI_WEBSITE_ID=

jest.config.js

@@ -1,6 +1,7 @@
 module.exports = {
+  testTimeout: 20000,
   verbose: true,
-  testEnvironment: 'jsdom',
+  /* testEnvironment: 'jsdom', */
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
   moduleNameMapper: {
     '\\.(css|less|jpg|png|svg)$': '<rootDir>/test/mocks/emptyModule.js',

src/UmamiApiClient.ts

@@ -50,7 +50,7 @@ export class UmamiApiClient {
 
     log(`GET ${dest}`, params, headers);
 
-    return get(dest, undefined, this.getHeaders(headers));
+    return get(dest, undefined, { ...this.getHeaders(headers), ...{ 'Content-Type': undefined } });
   }
 
   post(url: string, params?: object, headers?: object) {
@@ -187,8 +187,8 @@ export class UmamiApiClient {
       endAt: string;
       unit: string;
       timezone: string;
-      url: string;
-      eventName: string;
+      url?: string;
+      eventName?: string;
     },
   ): Promise<ApiResponse<Umami.WebsiteMetric[]>> {
     return this.get(`websites/${websiteId}/events`, params);
@@ -200,17 +200,17 @@ export class UmamiApiClient {
       type: string;
       startAt: number;
       endAt: number;
-      url: string;
-      referrer: string;
-      title: string;
-      query: string;
-      event: string;
-      os: string;
-      browser: string;
-      device: string;
-      country: string;
-      region: string;
-      city: string;
+      url?: string;
+      referrer?: string;
+      title?: string;
+      query?: string;
+      event?: string;
+      os?: string;
+      browser?: string;
+      device?: string;
+      country?: string;
+      region?: string;
+      city?: string;
     },
   ): Promise<ApiResponse<Umami.WebsiteMetric[]>> {
     return this.get(`websites/${websiteId}/metrics`, params);
@@ -243,16 +243,16 @@ export class UmamiApiClient {
       startAt: number;
       endAt: number;
       url: string;
-      referrer: string;
-      title: string;
-      query: string;
-      event: string;
-      os: string;
-      browser: string;
-      device: string;
-      country: string;
-      region: string;
-      city: string;
+      referrer?: string;
+      title?: string;
+      query?: string;
+      event?: string;
+      os?: string;
+      browser?: string;
+      device?: string;
+      country?: string;
+      region?: string;
+      city?: string;
     },
   ): Promise<ApiResponse<Umami.WebsiteStats>> {
     return this.get(`websites/${websiteId}/stats`, params);

test.js

@@ -1,15 +1,73 @@
+require('cross-fetch/polyfill');
 const apiClient = require('./dist/cjs/index');
 const dotenv = require('dotenv');
 dotenv.config();
 
-(async () => {
-  apiClient.client = apiClient.getClient();
+describe('Testing all get functions', () => {
+  beforeAll(() => {
+    apiClient.client = apiClient.getClient();
+    return;
+  });
 
-  try {
-    const x = await apiClient.client.getWebsites();
+  async function testGetWebsites() {
+    const results = await apiClient.client.getWebsites();
 
-    console.log(x);
-  } catch (e) {
-    console.log('ERROR', { statusCode: e.statusCode, message: e.message, e });
+    return results.ok;
   }
-})();
+
+  test('Testing: getWebsites', () => {
+    return expect(testGetWebsites()).resolves.toBeTruthy();
+  });
+
+  async function testGetMe() {
+    const results = await apiClient.client.getMe();
+    return results.ok;
+  }
+
+  test('Testing: getMe', () => {
+    return expect(testGetMe()).resolves.toBeTruthy();
+  });
+
+  async function testGetWebsiteMetrics() {
+    const results = await apiClient.client.getWebsiteMetrics(process.env.UMAMI_WEBSITE_ID, {
+      startAt: 1685566800000,
+      endAt: 1686916052440,
+      type: 'url',
+    });
+
+    return results.ok;
+  }
+
+  test('Testing: getWebsiteMetrics', () => {
+    return expect(testGetWebsiteMetrics()).resolves.toBeTruthy();
+  });
+
+  async function testGetWebsitePageviews() {
+    const results = await apiClient.client.getWebsitePageviews(process.env.UMAMI_WEBSITE_ID, {
+      startAt: 1685566800000,
+      endAt: 1686916052440,
+      url: '/',
+      timezone: 'America/Los_Angeles',
+    });
+
+    return results.ok;
+  }
+
+  test('Testing: getWebsitePageviews', () => {
+    return expect(testGetWebsitePageviews()).resolves.toBeTruthy();
+  });
+
+  async function testGetWebsitesStats() {
+    const results = await apiClient.client.getWebsiteStats(process.env.UMAMI_WEBSITE_ID, {
+      startAt: 1685566800000,
+      endAt: 1686916052440,
+      url: '/',
+    });
+
+    return results.ok;
+  }
+
+  test('Testing: getWebsitesStats', () => {
+    return expect(testGetWebsitesStats()).resolves.toBeTruthy();
+  });
+});