Merge pull request #187 from skedify/develop

skedify · Aug 6, 2020 · 35de587 · 35de587
2 parents d5d3e14 + 631aa86
commit 35de587
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 11 deletions.
diff --git a/src/__snapshots__/Skedify.test.js.snap b/src/__snapshots__/Skedify.test.js.snap
@@ -1036,6 +1036,9 @@ Object {
   "availability_settings": Object {
     "toString": [Function],
   },
+  "calendars": Object {
+    "toString": [Function],
+  },
   "completion_outcome_list": Object {
     "outcome_outcome_lists": Object {
       "toString": [Function],

diff --git a/src/resources/__snapshots__/index.test.js.snap b/src/resources/__snapshots__/index.test.js.snap
@@ -669,6 +669,14 @@ Object {
         "key": "location[geolocation]",
         "name": "geolocation",
       },
+      Object {
+        "key": "location[country]",
+        "name": "country",
+      },
+      Object {
+        "key": "location[postal_code]",
+        "name": "postal_code",
+      },
     ],
     "headers": Object {},
     "requires_domain_map": false,
@@ -1395,6 +1403,14 @@ Object {
         "key": "location[geolocation]",
         "name": "geolocation",
       },
+      Object {
+        "key": "location[country]",
+        "name": "country",
+      },
+      Object {
+        "key": "location[postal_code]",
+        "name": "postal_code",
+      },
     ],
     "headers": Object {},
     "requires_domain_map": false,
@@ -1515,7 +1531,9 @@ Object {
         "sub_resources": Object {},
       },
       "syncAccounts": Object {
-        "allowed_includes": Array [],
+        "allowed_includes": Array [
+          "calendars",
+        ],
         "allowed_methods": Array [
           "*",
         ],

diff --git a/src/resources/definedAvailability.js b/src/resources/definedAvailability.js
@@ -14,6 +14,8 @@ export const definedAvailability = createResourceDescription(
       'meeting_types',
       { name: 'timezone', key: 'format[timezone]' },
       { name: 'geolocation', key: 'location[geolocation]' },
+      { name: 'country', key: 'location[country]' },
+      { name: 'postal_code', key: 'location[postal_code]' },
     ],
     enable_pagination: false,
   }

diff --git a/src/resources/timetable.js b/src/resources/timetable.js
@@ -11,6 +11,8 @@ export const timetable = createResourceDescription('timetable', {
     'contacts',
     { name: 'timezone', key: 'format[timezone]' },
     { name: 'geolocation', key: 'location[geolocation]' },
+    { name: 'country', key: 'location[country]' },
+    { name: 'postal_code', key: 'location[postal_code]' },
   ],
   allowed_methods: [HTTP_VERB_GET],
   enable_pagination: false,

diff --git a/src/resources/users.js b/src/resources/users.js
@@ -2,22 +2,18 @@ import createResourceDescription from './util/createResourceDescription'
 
 export const users = createResourceDescription(
   'users',
+  { includes: ['employees', 'sync_accounts'] },
   {
-    includes: ['employees', 'sync_accounts'],
-  },
-  {
-    syncAccounts: createResourceDescription('sync_accounts'),
+    syncAccounts: createResourceDescription('sync_accounts', {
+      includes: ['calendars'],
+    }),
     events: createResourceDescription('events', {
       filters: ['start', 'end', 'split', 'group_by'],
     }),
-    employees: createResourceDescription('employees', {
-      includes: ['roles'],
-    }),
+    employees: createResourceDescription('employees', { includes: ['roles'] }),
     calendars: createResourceDescription(
       'calendars',
-      {
-        includes: ['sync_accounts'],
-      },
+      { includes: ['sync_accounts'] },
       {
         events: createResourceDescription('events', {
           filters: ['start', 'end', 'split', 'group_by'],