From 1158564fac87553e2da45622bde793d8adf14aa5 Mon Sep 17 00:00:00 2001
From: Roman Nyschuk <roman.nyschuk@device42.com>
Date: Tue, 4 Jul 2023 22:16:34 +0300
Subject: [PATCH 1/4] D42-29347 Bring up to date with the changes the app has

---
 d42_sd_sync.py     |  620 +++++++++++++++---
 freshservice.py    |  195 ++++--
 mapping.xml.sample | 1504 ++++++++++++++++++++++++++++++++++++++------
 requirements.txt   |    2 +
 4 files changed, 1995 insertions(+), 326 deletions(-)

diff --git a/d42_sd_sync.py b/d42_sd_sync.py
index d58e9d2..ff0f855 100755
--- a/d42_sd_sync.py
+++ b/d42_sd_sync.py
@@ -7,7 +7,7 @@
 import argparse
 import datetime
 from device42 import Device42
-from freshservice import FreshService, FreshServiceDuplicateSerialError
+from freshservice import FreshService, FreshServiceDuplicateValueError
 import xml.etree.ElementTree as eTree
 from xmljson import badgerfish as bf
 import time
@@ -28,6 +28,7 @@
 # The number of seconds to wait before we check the status of create relationships jobs.
 RELATIONSHIPS_JOB_WAIT_SECONDS = int(math.ceil(RELATIONSHIP_BATCH_SIZE / float(RELATIONSHIPS_CREATED_PER_SECOND)))
 ASSET_TYPE_BUSINESS_SERVICE = "Business Service"
+ASSET_TYPE_SERVER = "Server"
 
 parser = argparse.ArgumentParser(description="freshservice")
 
@@ -36,7 +37,9 @@
 parser.add_argument('-c', '--config', help='Config file', default='mapping.xml')
 parser.add_argument('-l', '--logfolder', help='log folder path', default='.')
 
-freshservice = None
+freshservice = FreshService()
+default_approver = None
+fs_cache = dict()
 
 
 class JSONEncoder(json.JSONEncoder):
@@ -46,14 +49,39 @@ def default(self, o):
         return json.JSONEncoder.default(self, o)
 
 
+def escape_value(name):
+    if name:
+        name = name.replace('<', '[')
+        name = name.replace('>', ']')
+        # Replace Unicode no-break spaces with normal spaces.
+        name = name.replace(u'\xa0', ' ')
+        name = name.strip()
+    return name
+
+
 def find_object_by_name(assets, name):
     for asset in assets:
-        if asset["name"].lower() == name.lower():
+        if asset["name"].lower() == escape_value(name).lower():
             return asset
 
     return None
 
 
+def find_object_in_map(objects_map, name):
+    if name:
+        return objects_map.get(escape_value(name).lower())
+
+    return None
+
+
+def find_object_id_in_map(objects_map, name):
+    obj = find_object_in_map(objects_map, name)
+    if obj:
+        return obj["id"]
+
+    return None
+
+
 def get_asset_type_field(asset_type_fields, map_info):
     for section in asset_type_fields:
         if section["field_header"] == map_info["@target-header"]:
@@ -82,14 +110,15 @@ def get_map_value_from_device42(source, map_info, b_add=False, asset_type_id=Non
                 break
     else:
         if "value-mapping" in map_info:
-            d42_val = None
-            if isinstance(map_info["value-mapping"]["item"], list):
-                items = map_info["value-mapping"]["item"]
-            else:
-                items = [map_info["value-mapping"]["item"]]
-            for item in items:
-                if item["@key"] == d42_value:
-                    d42_val = item["@value"]
+            cache_key = "%s-%s" % (map_info["@resource"], map_info["@target"])
+            if cache_key not in fs_cache:
+                if isinstance(map_info["value-mapping"]["item"], list):
+                    items = map_info["value-mapping"]["item"]
+                else:
+                    items = [map_info["value-mapping"]["item"]]
+
+                fs_cache[cache_key] = {item["@key"]: item["@value"] for item in items}
+            d42_val = fs_cache[cache_key].get(d42_value)
             if d42_val is None and "@default" in map_info["value-mapping"]:
                 default_value = map_info["value-mapping"]["@default"]
 
@@ -110,76 +139,134 @@ def get_map_value_from_device42(source, map_info, b_add=False, asset_type_id=Non
             pass
 
     if "@target-foregin-key" in map_info:
-        value = freshservice.get_id_by_name(map_info["@target-foregin"], d42_value)
-        if b_add and value is None and "@not-null" in map_info and map_info[
-            "@not-null"]:  # and "@required" in map_info and map_info["@required"]
+        target_foregin = map_info["@target-foregin"]
+        if target_foregin not in fs_cache:
+            fs_cache[target_foregin] = freshservice.get_objects_map("api/v2/%s" % target_foregin, target_foregin, map_info["@target-foregin-key"])
+
+        value = find_object_id_in_map(fs_cache[target_foregin], d42_value)
+        if b_add and value is None and "@not-null" in map_info and map_info["@not-null"]:  # and "@required" in map_info and map_info["@required"]
             if d42_value is not None:
                 if "@max-length" in map_info and len(d42_value) > map_info["@max-length"]:
                     name = d42_value[0:map_info["@max-length"] - 3] + "..."
                 else:
                     name = d42_value
-                if map_info["@target-foregin"] == "vendors":
-                    new_id = freshservice.insert_and_get_id_by_name(map_info["@target-foregin"], name, None)
+                if target_foregin in ["vendors", "groups", "agents"]:
+                    new_item = freshservice.insert_and_get_by_name(target_foregin, name, None, map_info["@target-foregin-key"])
                 else:
-                    new_id = freshservice.insert_and_get_id_by_name(map_info["@target-foregin"], name, asset_type_id)
-                d42_value = new_id
+                    new_item = freshservice.insert_and_get_by_name(target_foregin, name, asset_type_id, map_info["@target-foregin-key"])
+                fs_cache[target_foregin][new_item[map_info["@target-foregin-key"]].lower()] = new_item
+                d42_value = new_item["id"]
             else:
                 d42_value = None
         else:
             # If value is None, that means we could not find a match for the D42 value in Freshservice.
             # We will return the same D42 value since for product we will call this function again with
             # the required asset_type_id which is needed to create the value in Freshservice.
-            if value is not None:
+            if value is not None or "@not-null" not in map_info:
                 d42_value = value
 
+    if "@escape" in map_info and map_info["@escape"]:
+        d42_value = escape_value(d42_value)
+
     return d42_value
 
 
+def get_asset_type_field_from_map(asset_type_fields_map, asset_type_id, asset_type_fields, map_info):
+    if asset_type_id not in asset_type_fields_map:
+        asset_type_fields_map[asset_type_id] = dict()
+
+    target_header = map_info["@target-header"] if "@target-header" in map_info else ""
+    key = map_info["@resource"] + "-" + target_header
+    if key in asset_type_fields_map[asset_type_id]:
+        asset_type_field = asset_type_fields_map[asset_type_id][key]
+    else:
+        asset_type_field = get_asset_type_field(asset_type_fields, map_info)
+        asset_type_fields_map[asset_type_id][key] = asset_type_field
+
+    return asset_type_field
+
+
+def submit_relationship_create_job(relationships_to_create):
+    logger.info("adding relationship create job")
+    # Creating relationships using the v2 API is now an asynchronous operation and is
+    # performed using background jobs.  We will get back the job ID which can then be
+    # used to query the status of the job.
+    job_id = freshservice.insert_relationships({"relationships": relationships_to_create})
+    logger.info("added new relationship create job %s" % job_id)
+
+    return {
+        "job_id": job_id,
+        "relationships_to_create_count": len(relationships_to_create)
+    }
+
+
 def update_objects_from_server(sources, _target, mapping):
     global freshservice
 
-    logger.info("Getting all existing devices in FS.")
-    existing_objects = freshservice.request(_target["@path"] + "?include=type_fields", "GET", _target["@model"])
-    logger.info("Finished getting all existing devices in FS.")
+    # This method gets called for both devices and business apps.  Since it gets called first for devices,
+    # that is when the assets from Freshservice will get added to the cache.  When this method gets called
+    #  for business apps, we can get the objects out of the cache.
+    if "assets" in fs_cache:
+        logger.info("Getting all existing assets in FS from cache.")
+        existing_objects_map = fs_cache["assets"]
+        logger.info("finished getting all existing assets in FS from cache.")
+    else:
+        logger.info("Getting all existing assets in FS.")
+        existing_objects_map = freshservice.get_objects_map(_target["@path"], _target["@model"])
+        logger.info("finished getting all existing assets in FS.")
+        fs_cache["assets"] = existing_objects_map
+
+    if "asset_types" not in fs_cache:
+        asset_types_map = freshservice.get_objects_map("api/v2/asset_types", "asset_types")
+        fs_cache["asset_types"] = asset_types_map
+    else:
+        asset_types_map = fs_cache["asset_types"]
 
-    asset_type = freshservice.get_ci_type_by_name(_target["@asset-type"])
+    if "asset_type_fields" not in fs_cache:
+        fs_cache["asset_type_fields"] = {}
 
-    asset_type_fields = freshservice.get_asset_type_fields(asset_type["id"])
+    asset_type_fields_map = dict()
+    server_asset_type_id = find_object_id_in_map(asset_types_map, ASSET_TYPE_SERVER)
 
     for source in sources:
         error_skip = False
         while True:
             try:
-                existing_object = find_object_by_name(existing_objects, source["name"])
+                existing_object = find_object_in_map(existing_objects_map, source["name"])
+                if existing_object is None or existing_object["asset_type_id"] == server_asset_type_id:
+                    asset_type_id = find_object_id_in_map(asset_types_map, source["asset_type"])
+                else:
+                    asset_type_id = existing_object["asset_type_id"]
+
+                if asset_type_id in fs_cache["asset_type_fields"]:
+                    asset_type_fields = fs_cache["asset_type_fields"][asset_type_id]
+                else:
+                    asset_type_fields = freshservice.get_asset_type_fields(asset_type_id)
+                    fs_cache["asset_type_fields"][asset_type_id] = asset_type_fields
+
                 data = dict()
+                data['asset_type_id'] = asset_type_id
                 data["type_fields"] = dict()
-                for map_info in mapping["field"]:
-                    if error_skip and "@error-skip" in map_info and map_info["@error-skip"]:
-                        continue
-                    asset_type_field = get_asset_type_field(asset_type_fields, map_info)
-                    if asset_type_field is None:
-                        continue
 
-                    value = get_map_value_from_device42(source, map_info)
-
-                    if asset_type_field["asset_type_id"] is not None:
-                        data["type_fields"][asset_type_field["name"]] = value
-                    else:
-                        data[map_info["@target"]] = value
+                # if there is only one field in the mapping, it will be dict.
+                if isinstance(mapping["field"], dict):
+                    mapping["field"] = [mapping["field"]]
 
                 # validation
                 for map_info in mapping["field"]:
                     if error_skip and "@error-skip" in map_info and map_info["@error-skip"]:
                         continue
 
-                    asset_type_field = get_asset_type_field(asset_type_fields, map_info)
+                    asset_type_field = get_asset_type_field_from_map(asset_type_fields_map, asset_type_id, asset_type_fields, map_info)
                     if asset_type_field is None:
                         continue
 
+                    value = get_map_value_from_device42(source, map_info)
+
                     if asset_type_field["asset_type_id"] is not None:
-                        value = data["type_fields"][asset_type_field["name"]]
+                        data["type_fields"][asset_type_field["name"]] = value
                     else:
-                        value = data[map_info["@target"]]
+                        data[map_info["@target"]] = value
 
                     is_valid = True
                     if value is not None and "@min-length" in map_info and len(value) < map_info["@min-length"]:
@@ -190,7 +277,7 @@ def update_objects_from_server(sources, _target, mapping):
                     # value might have been translated to an associated ID in Freshservice by get_map_value_from_device42
                     #  which is why we need to check that value is a string using isinstance.
                     if value is not None and "@max-length" in map_info and isinstance(value, str) and len(value) > map_info["@max-length"]:
-                        value = value[0:map_info["@max-length"]-3] + "..."
+                        value = value[0:map_info["@max-length"] - 3] + "..."
                     if value is None and "@not-null" in map_info and map_info["@not-null"]:
                         if map_info["@target"] == "asset_tag":
                             is_valid = False
@@ -206,6 +293,9 @@ def update_objects_from_server(sources, _target, mapping):
                                 target_type = map_info["@target-type"]
                                 if target_type == "integer" or target_type == "float":
                                     value = 0
+                                elif target_type == "date":
+                                    value = None
+                                    is_valid = False
                                 else:
                                     value = " "
                             else:
@@ -219,7 +309,25 @@ def update_objects_from_server(sources, _target, mapping):
                         if target_type == "integer":
                             try:
                                 value = int(value)
-                            except:
+                            except Exception as e:
+                                logger.error(str(e))
+                                is_valid = False
+
+                        elif target_type == "dropdown":
+                            try:
+                                option = None
+                                for choice in asset_type_field["choices"]:
+                                    d42_value = value.lower()
+                                    choice_value = choice[0].lower()
+                                    if d42_value in choice_value or choice_value in d42_value:
+                                        option = choice[0]
+                                        break
+                                if option is None:
+                                    is_valid = False
+                                else:
+                                    value = option
+                            except Exception as e:
+                                logger.error(str(e))
                                 is_valid = False
 
                     if not is_valid:
@@ -236,8 +344,11 @@ def update_objects_from_server(sources, _target, mapping):
 
                 if existing_object is None:
                     logger.info("adding asset %s" % source["name"])
-                    new_asset_id = freshservice.insert_asset(data)
-                    logger.info("added new asset %d" % new_asset_id)
+                    new_asset = freshservice.insert_asset(data)
+                    logger.info("added new asset %d" % new_asset["id"])
+                    # We added a new object to Freshservice.  Add it to the map of objects that we know exist
+                    # in Freshservice.
+                    existing_objects_map[new_asset["name"].lower()] = new_asset
                 else:
                     logger.info("updating asset %s" % source["name"])
                     # This is a workaround for an issue with the Freshservice API where if a business service
@@ -248,20 +359,20 @@ def update_objects_from_server(sources, _target, mapping):
                     # Assigned agent isn't a member of the group.
                     # So, if the business service asset has an agent_id already populated, we will send that
                     # same value over and that will avoid this error.
-                    if _target["@asset-type"] == ASSET_TYPE_BUSINESS_SERVICE and "agent_id" in existing_object and existing_object["agent_id"]:
+                    if source["asset_type"] == ASSET_TYPE_BUSINESS_SERVICE and "agent_id" in existing_object and existing_object["agent_id"]:
                         data["agent_id"] = existing_object["agent_id"]
                     updated_asset_id = freshservice.update_asset(data, existing_object["display_id"])
-                    logger.info("updated new asset %d" % updated_asset_id)
+                    logger.info("updated existing asset %d" % updated_asset_id)
 
                 break
-            except FreshServiceDuplicateSerialError:
+            except FreshServiceDuplicateValueError:
                 if not error_skip:
                     error_skip = True
                     continue
                 break
             except Exception as e:
                 log = "Error (%s) updating device %s" % (str(e), source["name"])
-                logger.exception(log)
+                logger.error(log)
                 break
 
 
@@ -286,19 +397,20 @@ def delete_objects_from_server(sources, _target, mapping):
                 logger.info("deleted asset %s" % existing_object["name"])
             except Exception as e:
                 log = "Error (%s) deleting device %s" % (str(e), existing_object["name"])
-                logger.exception(log)
+                logger.error(log)
 
 
 def update_softwares_from_server(sources, _target, mapping):
     global freshservice
 
     logger.info("Getting all existing softwares in FS.")
-    existing_objects = freshservice.request(_target["@path"], "GET", _target["@model"])
+    existing_objects_map = freshservice.get_objects_map(_target["@path"], _target["@model"])
     logger.info("finished getting all existing softwares in FS.")
+    fs_cache["softwares"] = existing_objects_map
 
     for source in sources:
         try:
-            existing_object = find_object_by_name(existing_objects, source["name"])
+            existing_object = find_object_in_map(existing_objects_map, source["name"])
             data = dict()
             for map_info in mapping["field"]:
                 value = get_map_value_from_device42(source, map_info)
@@ -312,15 +424,18 @@ def update_softwares_from_server(sources, _target, mapping):
 
             if existing_object is None:
                 logger.info("adding software %s" % source["name"])
-                new_software_id = freshservice.insert_software(data)
-                logger.info("added new software %d" % new_software_id)
+                new_software = freshservice.insert_software(data)
+                logger.info("added new software %d" % new_software["id"])
+                # We added a new object to Freshservice.  Add it to the map of objects that we know exist
+                # in Freshservice.
+                existing_objects_map[new_software["name"].lower()] = new_software
             else:
                 logger.info("updating software %s" % source["name"])
                 updated_software_id = freshservice.update_software(data, existing_object["id"])
-                logger.info("updated new software %d" % updated_software_id)
+                logger.info("updated existing software %d" % updated_software_id)
         except Exception as e:
             log = "Error (%s) updating software %s" % (str(e), source["name"])
-            logger.exception(log)
+            logger.error(log)
 
 
 def delete_softwares_from_server(sources, _target, mapping):
@@ -344,42 +459,97 @@ def delete_softwares_from_server(sources, _target, mapping):
                 logger.info("deleted software %s" % existing_object["name"])
             except Exception as e:
                 log = "Error (%s) deleting software %s" % (str(e), existing_object["name"])
-                logger.exception(log)
+                logger.error(log)
+
+
+def update_products_from_server(sources, _target, mapping):
+    global freshservice
+
+    logger.info("Getting all existing products in FS.")
+    existing_objects_map = freshservice.get_objects_map(_target["@path"], _target["@model"])
+    logger.info("finished getting all existing products in FS.")
+
+    asset_types_map = freshservice.get_objects_map("api/v2/asset_types", "asset_types")
+    fs_cache["asset_types"] = asset_types_map
+    asset_type_id = find_object_id_in_map(asset_types_map, _target["@asset-type"])
+
+    for source in sources:
+        try:
+            existing_object = find_object_in_map(existing_objects_map, source["name"])
+            data = dict()
+            for map_info in mapping["field"]:
+                value = get_map_value_from_device42(source, map_info)
+
+                # value might have been translated to an associated ID in Freshservice by get_map_value_from_device42
+                #  which is why we need to check that value is a string using isinstance.
+                if value is not None and "@max-length" in map_info and isinstance(value, str) and len(value) > map_info["@max-length"]:
+                    value = value[0:map_info["@max-length"] - 3] + "..."
+
+                data[map_info["@target"]] = value
+
+            if existing_object is None:
+                logger.info("adding product %s" % source["name"])
+                data['asset_type_id'] = asset_type_id
+                new_product = freshservice.insert_product(data)
+                logger.info("added new product %d" % new_product["id"])
+                # We added a new object to Freshservice.  Add it to the map of objects that we know exist
+                # in Freshservice.
+                existing_objects_map[new_product["name"].lower()] = new_product
+            else:
+                logger.info("updating product %s" % source["name"])
+                updated_product_id = freshservice.update_product(data, existing_object["id"])
+                logger.info("updated existing product %d" % updated_product_id)
+        except Exception as e:
+            log = "Error (%s) updating product %s" % (str(e), source["name"])
+            logger.error(log)
 
 
 def create_installation_from_software_in_use(sources, _target, mapping):
     global freshservice
 
-    logger.info("Getting all existing devices in FS.")
-    existing_objects = freshservice.request("api/v2/assets", "GET", "assets")
-    logger.info("finished getting all existing devices in FS.")
+    if "assets" in fs_cache:
+        logger.info("Getting all existing assets in FS from cache.")
+        existing_objects_map = fs_cache["assets"]
+        logger.info("finished getting all existing assets in FS from cache.")
+    else:
+        logger.info("Getting all existing assets in FS.")
+        existing_objects_map = freshservice.get_objects_map(_target["@path"], _target["@model"])
+        logger.info("finished getting all existing assets in FS.")
+        fs_cache["assets"] = existing_objects_map
+
+    if "softwares" in fs_cache:
+        logger.info("Getting all existing softwares in FS from cache.")
+        existing_softwares_map = fs_cache["softwares"]
+        logger.info("finished getting all existing softwares in FS from cache.")
+    else:
+        logger.info("Getting all existing softwares in FS.")
+        existing_softwares_map = freshservice.get_objects_map(_target["@path"], _target["@model"])
+        logger.info("finished getting all existing softwares in FS.")
+        fs_cache["softwares"] = existing_softwares_map
 
-    logger.info("Getting all existing softwares in FS.")
-    existing_softwares = freshservice.request("api/v2/applications", "GET", "applications")
-    logger.info("finished getting all existing softwares in FS.")
+    software_to_assets_map = dict()
 
     for source in sources:
         try:
             logger.info("Processing %s - %s." % (source[mapping["@device-name"]], source[mapping["@software-name"]]))
-            asset = find_object_by_name(existing_objects, source[mapping["@device-name"]])
-            software = find_object_by_name(existing_softwares, source[mapping["@software-name"]])
+            asset = find_object_in_map(existing_objects_map, source[mapping["@device-name"]])
+            software = find_object_in_map(existing_softwares_map, source[mapping["@software-name"]])
 
             if asset is None:
                 log = "There is no asset(%s) in FS." % source[mapping["@device-name"]]
-                logger.exception(log)
+                logger.error(log)
                 continue
 
             if software is None:
                 log = "There is no software(%s) in FS." % source[mapping["@software-name"]]
-                logger.exception(log)
+                logger.error(log)
                 continue
 
-            installations = freshservice.get_installations_by_id(software["id"])
-            exist = False
-            for installation in installations:
-                if installation["installation_machine_id"] == asset["display_id"]:
-                    exist = True
-                    break
+            if software["id"] not in software_to_assets_map:
+                installations = freshservice.get_installations_by_id(software["id"])
+                software_to_assets_map[software["id"]] = {i["installation_machine_id"] for i in installations}
+
+            exist = asset["display_id"] in software_to_assets_map[software["id"]]
             if exist:
                 logger.info("There is already installation in FS.")
                 continue
@@ -390,18 +560,27 @@ def create_installation_from_software_in_use(sources, _target, mapping):
             data["installation_date"] = source[mapping["@install-date"]]
             logger.info("adding installation %s-%s" % (source[mapping["@device-name"]], source[mapping["@software-name"]]))
             freshservice.insert_installation(software["id"], data)
+            # We added a new installation to Freshservice.  Add it to the map of installations that we know exist
+            # in Freshservice.
+            software_to_assets_map[software["id"]].add(asset["display_id"])
             logger.info("added installation %s-%s" % (source[mapping["@device-name"]], source[mapping["@software-name"]]))
         except Exception as e:
             log = "Error (%s) creating installation %s" % (str(e), source[mapping["@device-name"]])
-            logger.exception(log)
+            logger.error(log)
 
 
 def create_relationships_from_affinity_group(sources, _target, mapping):
     global freshservice
 
-    logger.info("Getting all existing devices in FS.")
-    existing_objects = freshservice.request("api/v2/assets" + "?include=type_fields", "GET", _target["@model"])
-    logger.info("finished getting all existing devices in FS.")
+    if "assets" in fs_cache:
+        logger.info("Getting all existing assets in FS from cache.")
+        existing_objects_map = fs_cache["assets"]
+        logger.info("finished getting all existing assets in FS from cache.")
+    else:
+        logger.info("Getting all existing assets in FS.")
+        existing_objects_map = freshservice.get_objects_map(_target["@path"], _target["@model"])
+        logger.info("finished getting all existing assets in FS.")
+        fs_cache["assets"] = existing_objects_map
 
     logger.info("Getting relationship type in FS.")
     relationship_type = freshservice.get_relationship_type_by_content(mapping["@downstream-relationship"],
@@ -413,6 +592,9 @@ def create_relationships_from_affinity_group(sources, _target, mapping):
         logger.info(log)
         return
 
+    # The key will be the display_id of the primary asset and the value will be a set of
+    # the secondary asset display_id's that the primary asset is related to.
+    relationships_map = dict()
     relationships_to_create = list()
     source_count = len(sources)
     submitted_jobs = list()
@@ -420,48 +602,56 @@ def create_relationships_from_affinity_group(sources, _target, mapping):
     for idx, source in enumerate(sources):
         try:
             logger.info("Processing %s - %s." % (source[mapping["@key"]], source[mapping["@target-key"]]))
-            primary_asset = find_object_by_name(existing_objects, source[mapping["@key"]])
-            secondary_asset = find_object_by_name(existing_objects, source[mapping["@target-key"]])
+            primary_asset = find_object_in_map(existing_objects_map, source[mapping["@key"]])
 
             if primary_asset is None:
                 log = "There is no dependent asset(%s) in FS." % source[mapping["@key"]]
-                logger.exception(log)
+                logger.error(log)
                 continue
 
+            secondary_asset = find_object_in_map(existing_objects_map, source[mapping["@target-key"]])
+
             if secondary_asset is None:
                 log = "There is no dependency asset(%s) in FS." % source[mapping["@target-key"]]
-                logger.exception(log)
+                logger.error(log)
                 continue
 
-            relationships = freshservice.get_relationships_by_id(primary_asset["display_id"])
-            exist = False
-            for relationship in relationships:
-                if relationship["relationship_type_id"] == relationship_type["id"]:
-                    if relationship["secondary_id"] == secondary_asset["display_id"]:
-                        exist = True
-                        break
+            primary_asset_display_id = primary_asset["display_id"]
+
+            if primary_asset_display_id not in relationships_map:
+                relationships_map[primary_asset_display_id] = set()
+                relationships = freshservice.get_relationships_by_id(primary_asset_display_id)
+
+                for relationship in relationships:
+                    if relationship["relationship_type_id"] == relationship_type["id"]:
+                        relationships_map[primary_asset_display_id].add(relationship["secondary_id"])
+
+            exist = secondary_asset["display_id"] in relationships_map[primary_asset_display_id]
             if exist:
                 logger.info("There is already relationship in FS.")
                 continue
 
             relationships_to_create.append({
                 "relationship_type_id": relationship_type["id"],
-                "primary_id": primary_asset["display_id"],
+                "primary_id": primary_asset_display_id,
                 "primary_type": "asset",
                 "secondary_id": secondary_asset["display_id"],
                 "secondary_type": "asset"
             })
 
+            relationships_to_create_count = len(relationships_to_create)
+            relationships_map[primary_asset_display_id].add(secondary_asset["display_id"])
+
             # Create a new job if we reached our batch size or we are on the last item (which
             # means this is the last batch we will be submitting).
-            if len(relationships_to_create) >= RELATIONSHIP_BATCH_SIZE or idx == source_count - 1:
+            if relationships_to_create_count >= RELATIONSHIP_BATCH_SIZE or idx == source_count - 1:
                 submitted_jobs.append(submit_relationship_create_job(relationships_to_create))
 
                 # Clear the list for the next batch of relationships we are going to send.
                 del relationships_to_create[:]
         except Exception as e:
             log = "Error (%s) creating relationship %s" % (str(e), source[mapping["@key"]])
-            logger.exception(log)
+            logger.error(log)
 
     # We may not have submitted the last batch of relationships to create if the last item in
     # sources did not result in a relationship needing to be created (e.g. one of the assets
@@ -541,19 +731,6 @@ def create_relationships_from_affinity_group(sources, _target, mapping):
             logger.info("%d of %d relationship create jobs did not complete." % (jobs_not_completed_count, submitted_jobs_count))
 
 
-def submit_relationship_create_job(relationships_to_create):
-    logger.info("adding relationship create job")
-    # Creating relationships using the v2 API is now an asynchronous operation and is
-    # performed using background jobs.  We will get back the job ID which can then be
-    # used to query the status of the job.
-    job_id = freshservice.insert_relationships({"relationships": relationships_to_create})
-    logger.info("added new relationship create job %s" % job_id)
-
-    return {
-        "job_id": job_id,
-        "relationships_to_create_count": len(relationships_to_create)
-    }
-
 def delete_relationships_from_affinity_group(sources, _target, mapping):
     global freshservice
 
@@ -650,6 +827,217 @@ def delete_relationships_from_business_app(sources, _target, mapping):
             logger.exception(log)
 
 
+def update_contracts_from_server(sources, _target, mapping):
+    global freshservice
+
+    logger.info("Getting all existing contracts in FS.")
+    existing_objects_map = freshservice.get_objects_map(_target["@path"], _target["@model"])
+    logger.info("finished getting all existing contracts in FS.")
+    fs_cache["contracts"] = existing_objects_map
+
+    if "softwares" in fs_cache:
+        logger.info("Getting all existing softwares in FS from cache.")
+        existing_softwares_map = fs_cache["softwares"]
+        logger.info("finished getting all existing softwares in FS from cache.")
+    else:
+        logger.info("Getting all existing softwares in FS.")
+        existing_softwares_map = freshservice.get_objects_map(_target["@path"], _target["@model"])
+        logger.info("finished getting all existing softwares in FS.")
+        fs_cache["softwares"] = existing_softwares_map
+
+    for source in sources:
+        error_skip = False
+        while True:
+            try:
+                existing_object = find_object_in_map(existing_objects_map, source["name"])
+                data = dict()
+                if not default_approver:
+                    raise Exception("The approver is required.")
+                data['approver_id'] = int(default_approver)
+
+                # validation
+                for map_info in mapping["field"]:
+                    if error_skip and "@error-skip" in map_info and map_info["@error-skip"]:
+                        continue
+
+                    if "@target-foregin-key" in map_info and map_info["@target-foregin"] == "applications":
+                        existing_software = find_object_in_map(existing_softwares_map, source[map_info["@resource"]])
+                        value = existing_software["id"]
+                    else:
+                        value = get_map_value_from_device42(source, map_info)
+
+                    if "@target-sub-key" not in map_info:
+                        data[map_info["@target"]] = value
+                    else:  # Item cost detail attributes
+                        if map_info["@target"] not in data:
+                            data[map_info["@target"]] = [{
+                                map_info["@target-sub-key"]: value
+                            }]
+                        else:
+                            data[map_info["@target"]][0][map_info["@target-sub-key"]] = value
+
+                    is_valid = True
+                    if value is not None and "@min-length" in map_info and len(value) < map_info["@min-length"]:
+                        is_valid = False
+                        if value == "" and "@set-space" in map_info and map_info["@set-space"]:
+                            is_valid = True
+                            value = " " * map_info["@min-length"]
+                    # value might have been translated to an associated ID in Freshservice by get_map_value_from_device42
+                    #  which is why we need to check that value is a string using isinstance.
+                    if value is not None and "@max-length" in map_info and isinstance(value, str) and len(value) > map_info["@max-length"]:
+                        value = value[0:map_info["@max-length"] - 3] + "..."
+                    if value is None and "@not-null" in map_info and map_info["@not-null"]:
+                        # There is an issue with the Freshservice API where sending a null value for
+                        # a field will result in the API returning an error like "Has 0 characters,
+                        # it should have minimum of 1 characters and can have maximum of 255 characters".
+                        # This prevents us from being able to clear these field values in Freshservice (even though
+                        # the Freshservice UI allows you to clear these fields).  To get around this, we will send
+                        # a single space for string values and a 0 for integer and float values when the value
+                        # coming from D42 is null.
+                        if "@target-type" in map_info:
+                            target_type = map_info["@target-type"]
+                            if target_type == "integer" or target_type == "float":
+                                value = 0
+                            elif target_type == "date":
+                                value = None
+                                is_valid = False
+                            else:
+                                value = " "
+                        else:
+                            value = " "
+
+                    if value == 0 and "@not-zero" in map_info and map_info["@not-zero"]:
+                        # Some fields in Freshservice do not allow a 0 value.
+                        # D42 does allow a 0 for the value being synced over,
+                        # so when we try to sync that data to Freshservice,
+                        # the API returns an error like "It should be a Positive Number
+                        # less than or equal to 99999999.99" when we send a 0 value to a field
+                        # that does not accept 0.
+                        # To get around this, we will send 1 for integer values and a 0.01
+                        # for float values when the value coming from D42 is 0.
+                        if "@target-type" in map_info:
+                            target_type = map_info["@target-type"]
+                            if target_type == "integer":
+                                value = 1
+                            elif target_type == "float":
+                                value = 0.01
+                            else:
+                                value = None
+                                is_valid = False
+                        else:
+                            value = 0.01
+
+                    if "@target-foregin-key" in map_info and value is not None and isinstance(value, str):
+                        value = get_map_value_from_device42(source, map_info, True)
+                        is_valid = value is not None
+                    if "@target-type" in map_info and value is not None:
+                        target_type = map_info["@target-type"]
+                        if target_type == "integer":
+                            try:
+                                value = int(value)
+                            except Exception as e:
+                                logger.error(str(e))
+                                is_valid = False
+
+                    if not is_valid:
+                        logger.debug("argument '%s' is invalid." % map_info["@target"])
+                        if "@target-sub-key" not in map_info:
+                            data.pop(map_info["@target"], None)
+                        else:
+                            data[[map_info["@target"]]][0].pop(map_info["@target-sub-key"])
+                    if is_valid:
+                        if "@target-sub-key" not in map_info:
+                            data[map_info["@target"]] = value
+                        else:
+                            data[map_info["@target"]][0][map_info["@target-sub-key"]] = value
+
+                if existing_object is None:
+                    logger.info("adding contract %s" % source["name"])
+                    new_contract = freshservice.insert_contract(data)
+                    logger.info("added new contract %d" % new_contract["id"])
+                    # We added a new object to Freshservice.  Add it to the map of objects that we know exist
+                    # in Freshservice.
+                    existing_objects_map[new_contract["name"].lower()] = new_contract
+                else:
+                    logger.info("updating contract %s" % source["name"])
+                    updated_id = freshservice.update_contract(data, existing_object["id"])
+                    logger.info("updated contract %d" % updated_id)
+
+                break
+            except FreshServiceDuplicateValueError:
+                if not error_skip:
+                    error_skip = True
+                    continue
+                break
+            except Exception as e:
+                log = "Error (%s) updating contract %s" % (str(e), source["name"])
+                logger.error(log)
+                break
+
+
+def create_association_between_asset_and_contract(sources, _target, mapping):
+    global freshservice
+
+    if "assets" in fs_cache:
+        logger.info("Getting all existing assets in FS from cache.")
+        existing_assets_map = fs_cache["assets"]
+        logger.info("finished getting all existing assets in FS from cache.")
+    else:
+        logger.info("Getting all existing assets in FS.")
+        existing_assets_map = freshservice.get_objects_map(_target["@path"], _target["@model"])
+        logger.info("finished getting all existing assets in FS.")
+        fs_cache["assets"] = existing_assets_map
+
+    if "contracts" in fs_cache:
+        logger.info("Getting all existing contracts in FS from cache.")
+        existing_contracts_map = fs_cache["contracts"]
+        logger.info("finished getting all existing contracts in FS from cache.")
+    else:
+        logger.info("Getting all existing contracts in FS.")
+        existing_contracts_map = freshservice.get_objects_map(_target["@path"], _target["@model"])
+        logger.info("finished getting all existing contracts in FS.")
+        fs_cache["contracts"] = existing_contracts_map
+
+    # Key will be the contract ID and the value will be a set of asset IDs that the contract is
+    # associated with.
+    contract_to_assets_map = dict()
+
+    for source in sources:
+        try:
+            logger.info("Processing %s - %s." % (source[mapping["@device-name"]], source[mapping["@contract-name"]]))
+            asset = find_object_in_map(existing_assets_map, source[mapping["@device-name"]])
+            contract = find_object_in_map(existing_contracts_map, source[mapping["@contract-name"]])
+
+            if asset is None:
+                log = "There is no asset(%s) in FS." % source[mapping["@device-name"]]
+                logger.error(log)
+                continue
+
+            if contract is None:
+                log = "There is no contract(%s) in FS." % source[mapping["@contract-name"]]
+                logger.error(log)
+                continue
+
+            if contract["id"] not in contract_to_assets_map:
+                associated_assets = freshservice.get_associated_assets_by_contract(contract["id"])
+                contract_to_assets_map[contract["id"]] = {a["display_id"] for a in associated_assets}
+
+            if asset['display_id'] in contract_to_assets_map[contract["id"]]:
+                logger.info("There is already associated asset in FS.")
+                continue
+
+            contract_to_assets_map[contract["id"]].add(asset['display_id'])
+            data = dict()
+            data['associated_asset_ids'] = list(contract_to_assets_map[contract["id"]])
+
+            logger.info("adding associated asset %s-%s" % (source[mapping["@device-name"]], source[mapping["@contract-name"]]))
+            freshservice.update_contract(data, contract["id"])
+            logger.info("added associated asset %s-%s" % (source[mapping["@device-name"]], source[mapping["@contract-name"]]))
+        except Exception as e:
+            log = "Error (%s) creating associated assets %s-%s" % (str(e), source[mapping["@device-name"]], source[mapping["@contract-name"]])
+            logger.error(log)
+
+
 def parse_config(url):
     config = eTree.parse(url)
     meta = config.getroot()
@@ -706,6 +1094,12 @@ def task_execute(task, device42):
             delete_softwares_from_server(sources, _target, mapping)
         else:
             create_installation_from_software_in_use(sources, _target, mapping)
+    elif _type == "contracts":
+        update_contracts_from_server(sources, _target, mapping)
+    elif _type == "contract_in_asset":
+        create_association_between_asset_and_contract(sources, _target, mapping)
+    elif _type == "product":
+        update_products_from_server(sources, _target, mapping)
     else:
         if "@delete" in _target and _target["@delete"]:
             delete_objects_from_server(sources, _target, mapping)
@@ -714,8 +1108,24 @@ def task_execute(task, device42):
         update_objects_from_server(sources, _target, mapping)
 
 
+def get_agent_from_freshservice(email):
+    global freshservice
+
+    default_approver = None
+    try:
+        agents = freshservice.get_all_agents()
+        for agent in agents:
+            if agent['email'] == email:
+                return agent['id']
+    except Exception as e:
+        logger.error(str(e))
+
+    return default_approver
+
+
 def main():
     global freshservice
+    global default_approver
 
     args = parser.parse_args()
     if args.debug:
@@ -736,8 +1146,10 @@ def main():
     settings = config["meta"]["settings"]
     device42 = Device42(settings['device42']['@url'], settings['device42']['@user'], settings['device42']['@pass'])
     freshservice = FreshService(settings['freshservice']['@url'], settings['freshservice']['@api_key'], logger)
+    if '@default_approver_email' in settings['freshservice']:
+        default_approver = get_agent_from_freshservice(settings['freshservice']['@default_approver_email'])
 
-    if not "task" in config["meta"]["tasks"]:
+    if "task" not in config["meta"]["tasks"]:
         logger.debug("No task")
         return 0
 
diff --git a/freshservice.py b/freshservice.py
index e6e3ec3..074113d 100755
--- a/freshservice.py
+++ b/freshservice.py
@@ -5,9 +5,15 @@
 from datetime import datetime
 import time
 import logging
+import jwt
+import pytz
 
 requests.packages.urllib3.disable_warnings()
 
+# in seconds
+DEFAULT_RETRY_AFTER = 10
+RETRY_AFTER_HEADER = 'Retry-After'
+
 
 class FreshServiceBaseException(Exception):
     pass
@@ -17,12 +23,16 @@ class FreshServiceHTTPError(FreshServiceBaseException):
     pass
 
 
-class FreshServiceDuplicateSerialError(FreshServiceHTTPError):
+class FreshServiceDuplicateValueError(FreshServiceHTTPError):
     pass
 
 
 class FreshService(object):
     CITypeServerName = "Server"
+    PAGE_SIZE = 100
+    FS_INTEGRATION_NAME_HEADER = 'FS-INTEGRATION-NAME'
+    JWT_ALGORITHM = 'HS256'
+    JWT_RECREATE_TIME = 15
 
     def __init__(self, endpoint, api_key, logger, **kwargs):
         self.base = endpoint
@@ -36,8 +46,26 @@ def __init__(self, endpoint, api_key, logger, **kwargs):
         self.period_call_api = 1
         self.api_call_count = 0
         self.asset_types = None
-
-    def _send(self, method, path, data=None):
+        self.created_by_jwt = None
+        self.expired_time_jwt = None
+
+    def _get_created_by_jwt(self):
+        if self.created_by_jwt is not None:
+            if self.expired_time_jwt - int(time.time()) > self.JWT_RECREATE_TIME:
+                return self.created_by_jwt
+
+        timestamp = int(round(time.time() + 120))
+        encoded = jwt.encode(
+            {'iss': 'device_42', 'exp': timestamp},
+            self.api_key,
+            self.JWT_ALGORITHM
+        )
+
+        self.created_by_jwt = encoded
+        self.expired_time_jwt = timestamp
+        return encoded
+
+    def _send(self, method, path, data=None, headers=None):
         """ General method to send requests """
         now = datetime.now()
         self.api_call_count += 1
@@ -56,15 +84,19 @@ def _send(self, method, path, data=None):
             params = data
             data = None
 
+        all_headers = self.headers
+        if headers:
+            all_headers.update(headers)
+
         while True:
             if method == 'GET':
                 resp = requests.request(method, url, data=data, params=params,
                                         auth=(self.api_key, "X"),
-                                        verify=self.verify_cert, headers=self.headers)
+                                        verify=self.verify_cert, headers=all_headers)
             else:
                 resp = requests.request(method, url, json=data, params=params,
                                         auth=(self.api_key, "X"),
-                                        verify=self.verify_cert, headers=self.headers)
+                                        verify=self.verify_cert, headers=all_headers)
 
             self.last_time_call_api = datetime.now()
 
@@ -72,8 +104,18 @@ def _send(self, method, path, data=None):
                 if resp.status_code == 429:
                     self._log("HTTP %s (%s) Error %s: %s\n request was %s" %
                               (method, path, resp.status_code, resp.text, data))
-                    self._log("Throttling 1 min...")
-                    time.sleep(60)
+
+                    retry_after = DEFAULT_RETRY_AFTER
+                    header_value = resp.headers.get(RETRY_AFTER_HEADER)
+                    if header_value:
+                        try:
+                            retry_after = int(header_value)
+                        except ValueError as e:
+                            client.captureException(extra={'header_value': header_value})
+                            self._log('Failed to convert Retry-After value of "%s" to int: %s' % (header_value, str(e)))
+
+                    self._log("Throttling %d second(s)..." % retry_after)
+                    time.sleep(retry_after)
                     continue
 
                 if resp.status_code == 400:
@@ -82,8 +124,9 @@ def _send(self, method, path, data=None):
                         error_resp = resp.json()
                         if error_resp["description"] == "Validation failed":
                             for error in error_resp["errors"]:
-                                if error["field"] == "serial_number" and error["message"] == " must be unique":
-                                    exception = FreshServiceDuplicateSerialError("HTTP %s (%s) Error %s: %s\n request was %s" %
+                                if (error["field"] == "serial_number" or error["field"] == "item_id") and \
+                                        (error["message"] == " must be unique" or error["message"] == " is not unique"):
+                                    exception = FreshServiceDuplicateValueError("HTTP %s (%s) Error %s: %s\n request was %s" %
                                                                 (method, path, resp.status_code, resp.text, data))
                                     break
                     except Exception:
@@ -107,15 +150,15 @@ def _send(self, method, path, data=None):
     def _get(self, path, data=None):
         return self._send("GET", path, data=data)
 
-    def _post(self, path, data):
+    def _post(self, path, data, headers=None):
         if not path.endswith('/'):
             path += '/'
-        return self._send("POST", path, data=data)
+        return self._send("POST", path, data=data, headers=headers)
 
-    def _put(self, path, data):
+    def _put(self, path, data, headers=None):
         if not path.endswith('/'):
             path += '/'
-        return self._send("PUT", path, data=data)
+        return self._send("PUT", path, data=data, headers=headers)
 
     def _delete(self, path, data=None):
         return self._send("DELETE", path, data)
@@ -124,14 +167,17 @@ def _log(self, message, level=logging.DEBUG):
         if self.logger:
             self.logger.log(level, message)
 
+    def _get_asset_headers(self):
+        return {self.FS_INTEGRATION_NAME_HEADER: self._get_created_by_jwt()}
+
     def insert_asset(self, data):
         path = "api/v2/assets"
-        result = self._post(path, data)
-        return result["asset"]["id"]
+        result = self._post(path, data, self._get_asset_headers())
+        return self.create_basic_object(result["asset"])
 
     def update_asset(self, data, display_id):
         path = "api/v2/assets/%d" % display_id
-        result = self._put(path, data)
+        result = self._put(path, data, self._get_asset_headers())
         return result["asset"]["id"]
 
     def delete_asset(self, display_id):
@@ -147,7 +193,7 @@ def get_assets_by_asset_type(self, asset_type_id):
     def insert_software(self, data):
         path = "api/v2/applications"
         result = self._post(path, data)
-        return result["application"]["id"]
+        return self.create_basic_object(result["application"])
 
     def update_software(self, data, id):
         path = "api/v2/applications/%d" % id
@@ -159,6 +205,30 @@ def delete_software(self, id):
         result = self._delete(path)
         return result
 
+    def insert_product(self, data):
+        path = "api/v2/products"
+        result = self._post(path, data)
+        return self.create_basic_object(result["product"])
+
+    def update_product(self, data, id):
+        path = "api/v2/products/%d" % id
+        result = self._put(path, data)
+        return result["product"]["id"]
+
+    def insert_contract(self, data):
+        path = "api/v2/contracts"
+        result = self._post(path, data)
+        return self.create_basic_object(result["contract"])
+
+    def update_contract(self, data, id):
+        path = "api/v2/contracts/%d" % id
+        result = self._put(path, data)
+        return result["contract"]["id"]
+
+    def get_associated_assets_by_contract(self, contract_id):
+        path = "/api/v2/contracts/%d/associated-assets" % contract_id
+        return self.request(path, "GET", "associated_assets")
+
     def get_all_ci_types(self):
         if self.asset_types is not None:
             return self.asset_types
@@ -194,12 +264,6 @@ def get_all_server_ci_types(self):
     def get_server_ci_type(self):
         return self.get_ci_type_by_name(self.CITypeServerName)
 
-    def get_windows_server_ci_type(self):
-        return self.get_ci_type_by_name(self.CITypeWindowsServerName)
-
-    def get_unix_server_ci_type(self):
-        return self.get_ci_type_by_name(self.CITypeUnixServerName)
-
     def get_asset_type_fields(self, asset_type_id):
         path = "api/v2/asset_types/%d/fields" % asset_type_id
         return self._get(path)["asset_type_fields"]
@@ -223,25 +287,37 @@ def get_vendors(self):
         vendors = self._get(path)
         return vendors["vendors"]
 
-    def get_id_by_name(self, model, name):
+    def get_all_agents(self):
+        path = "/api/v2/agents"
+        return self.request(path, "GET", "agents")
+
+    def get_agents(self, search, page, per_page):
+        path = "/api/v2/agents"
+        data = {'page': page, 'per_page': per_page}
+        if search and len(search) >= 2:
+            data['query'] = '"~[name|first_name|last_name|email]:\'' + search + '\'"'
+        vendors = self._get(path, data)
+        return vendors["agents"]
+
+    def get_id_by_name(self, model, name, foregin_key="name"):
         path = "/api/v2/%s" % model
         models = self.request(path, "GET", model)
         for model in models:
-            if "name" in model and model["name"] is not None and name is not None and \
-                            model["name"].lower() == name.lower():
+            if foregin_key in model and model[foregin_key] is not None and name is not None and \
+                            model[foregin_key].lower() == name.lower():
                 return model["id"]
 
         return None
 
-    def insert_and_get_id_by_name(self, model, name, asset_type_id):
+    def insert_and_get_by_name(self, model, name, asset_type_id, foregin_key="name"):
         path = "/api/v2/%s" % model
         if asset_type_id is not None:
-            data = {"name": name, "asset_type_id": asset_type_id}
+            data = {foregin_key: name, "asset_type_id": asset_type_id}
         else:
-            data = {"name": name}
+            data = {foregin_key: name}
         models = self._post(path, data)
         for key in models:
-            return models[key]["id"]
+            return self.create_basic_object(models[key])
 
         return None
 
@@ -250,7 +326,7 @@ def request(self, source_url, method, model):
             models = []
             page = 1
             while True:
-                result = self._get(source_url, data={"page": page})
+                result = self._get(source_url, data={"page": page, "per_page": self.PAGE_SIZE})
                 if model in result:
                     models += result[model]
                     if len(result[model]) == 0:
@@ -263,6 +339,46 @@ def request(self, source_url, method, model):
             return models
         return []
 
+    def normalize_value(self, val):
+        if val:
+            # Replace Unicode no-break spaces with normal spaces.
+            # We are doing the same with the data we get from D42.
+            # This will allow us to find objects in Freshservice regardless if the name
+            # is using Unicode no-break spaces or normal ASCII spaces since the Unicode
+            # no-break spaces will always be converted to normal ASCII spaces.
+            return val.replace(u'\xa0', ' ')
+
+        return val
+
+    def create_basic_object(self, m):
+        # Create an object using only the properties that we will need.  This object will
+        # be stored in the cache, so we want to try to minimize the memory footprint of it.
+        obj = {"id": m["id"]}
+
+        if "name" in m:
+            obj["name"] = self.normalize_value(m["name"])
+
+        if "email" in m:
+            obj["email"] = m["email"]
+
+        # Not all models have a display_id (e.g. assets do, but asset types do not).
+        if "display_id" in m:
+            obj["display_id"] = m["display_id"]
+
+        if "agent_id" in m:
+            obj["agent_id"] = m["agent_id"]
+
+        if "asset_type_id" in m:
+            obj["asset_type_id"] = m["asset_type_id"]
+
+        return obj
+
+    def get_objects_map(self, source_url, model, foregin_key="name"):
+        objects = self.request(source_url, "GET", model)
+        # Return a dictionary where the key is the lowercase name of the object and the value is
+        # the basic object (e.g. id, name, etc.).
+        return {self.normalize_value(obj[foregin_key]).lower(): self.create_basic_object(obj) for obj in objects}
+
     def get_relationship_type_by_content(self, downstream, upstream):
         path = "/api/v2/relationship_types"
         relationship_types = self.request(path, "GET", "relationship_types")
@@ -288,21 +404,7 @@ def detach_relationship(self, relationship_id):
 
     def get_installations_by_id(self, display_id):
         path = "/api/v2/applications/%d/installations" % display_id
-
-        models = []
-        page = 1
-        while True:
-            result = self._get(path, data={"page": page})
-            if "installations" in result:
-                models += result["installations"]
-                if len(result["installations"]) == 0:
-                    break
-            else:
-                break
-
-            page += 1
-
-        return models
+        return self.request(path, "GET", "installations")
 
     def insert_installation(self, display_id, data):
         path = "/api/v2/applications/%d/installations" % display_id
@@ -315,4 +417,3 @@ def insert_installation(self, display_id, data):
     def get_job(self, job_id):
         path = "/api/v2/jobs/%s" % job_id
         return self._get(path)
-
diff --git a/mapping.xml.sample b/mapping.xml.sample
index edee6b5..4dfbb93 100644
--- a/mapping.xml.sample
+++ b/mapping.xml.sample
@@ -2,7 +2,8 @@
     <settings>
         <freshservice
                 url="{url}.freshservice.com"
-                api_key="{api_key}"/>
+                api_key="{api_key}"
+                default_approver_email=""/>
         <device42
                 url="https://{url}"
                 user="{user}"
@@ -10,234 +11,1082 @@
     </settings>
 
     <tasks>
-        <task enable="true" description="Copy Servers from Device42 to FreshService using DOQL v2" d42_min_version="16.19.00">
+        <task enable="true" name="Products" type="product" description="Copy Product info from Device42 to FreshService" d42_min_version="16.19.00">
             <api>
-                <target model="assets" target="freshservice" method="POST" update_method="PUT" path="api/v2/assets"
-                        asset-type="Server"/>
-                <resource model="Devices" target="device42" method="POST"
+                <target model="products" target="freshservice" method="POST" update_method="PUT" path="api/v2/products" asset-type="Hardware"/>
+                <resource target="device42" method="POST"
                           path="services/data/v1.0/query/"
                           doql="
-                                select view_device_v2.*,
-                                coalesce(view_device_v2.physicalsubtype, view_device_v2.virtualsubtype) as device_subtype,
-                                core_per_cpu * total_cpus as total_cpucore,
-                                t_cost.cost,
+                            select distinct
                                 view_vendor_v1.name as manufacturer,
-                                case WHEN view_device_v2.type = 'Virtual' THEN view_device_v2.type WHEN view_device_v2.type = 'Cluster' THEN view_device_v2.type ELSE coalesce(view_hardware_v2.name, view_device_v2.type) END as hw_model,
-                                case WHEN view_device_v2.hz = 'MHz' and view_device_v2.cpu_speed is not null  THEN view_device_v2.cpu_speed / 1000 ELSE view_device_v2.cpu_speed END as cpuspeed,
-                                case WHEN view_device_v2.ram_size_type = 'MB' and view_device_v2.ram is not null  THEN view_device_v2.ram / 1024 WHEN view_device_v2.ram_size_type = 'TB' and view_device_v2.ram is not null  THEN view_device_v2.ram * 1024 ELSE view_device_v2.ram END as ramsize,
-                                network_ip.ip_address, network_hw.hwaddress,
-                                CEIL(COALESCE(p.total_part_disk_size,
-                                                CASE
-                                                    WHEN view_device_v2.hard_disk_count IS NOT NULL AND
-                                                         view_device_v2.hard_disk_size IS NOT NULL AND
-                                                         view_device_v2.hard_disk_size_type IS NOT NULL THEN
-                                                            view_device_v2.hard_disk_count *
-                                                            CASE
-                                                                WHEN view_device_v2.hard_disk_size_type = 'GB' THEN view_device_v2.hard_disk_size
-                                                                WHEN view_device_v2.hard_disk_size_type = 'TB' THEN view_device_v2.hard_disk_size * 1024
-                                                                WHEN view_device_v2.hard_disk_size_type = 'PB' THEN view_device_v2.hard_disk_size * 1024 * 1024
-                                                                ELSE NULL
-                                                            END
-                                                    ELSE NULL
-                                                END)) AS disk_size
-                                from view_device_v2 left join view_hardware_v2 on view_device_v2.hardware_fk = view_hardware_v2.hardware_pk left join  (select view_ipaddress_v1.device_fk,  string_agg(host(view_ipaddress_v1.ip_address)::character varying, ', ' order by view_ipaddress_v1.ip_address) as ip_address from view_ipaddress_v1 group by view_ipaddress_v1.device_fk) network_ip on view_device_v2.device_pk=network_ip.device_fk
-                                left join (select device_fk, string_agg(
-                                    CASE
-                                        WHEN LENGTH(TRIM(view_netport_v1.hwaddress)) = 12
-                                        THEN CONCAT_WS(':',left(TRIM(view_netport_v1.hwaddress),2), substring(TRIM(view_netport_v1.hwaddress),3,2), substring(TRIM(view_netport_v1.hwaddress),5,2), substring(TRIM(view_netport_v1.hwaddress),7,2), substring(TRIM(view_netport_v1.hwaddress),9,2), right(TRIM(view_netport_v1.hwaddress),2))
-                                        ELSE
-                                            view_netport_v1.hwaddress
-                                        END, ', ' order by view_netport_v1.hwaddress) as hwaddress from view_netport_v1 where (view_netport_v1.hwaddress is not null AND LENGTH(TRIM(view_netport_v1.hwaddress)) > 0) group by view_netport_v1.device_fk) network_hw on view_device_v2.device_pk=network_hw.device_fk
-                                    left join (select device_fk, sum(cost) as cost from view_purchaselineitem_v1 left join view_purchaselineitems_to_devices_v1 on purchaselineitem_fk = purchaselineitem_pk group by device_fk) t_cost on t_cost.device_fk=device_pk left join view_vendor_v1 on vendor_pk=vendor_fk
-                                LEFT OUTER JOIN (
-                                   SELECT p.device_fk,
-                                     SUM(p.pcount *
-                                         CASE
-                                           WHEN pm.hdsize_unit = 'GB' THEN pm.hdsize
-                                           WHEN pm.hdsize_unit = 'TB' THEN pm.hdsize * 1024
-                                           WHEN pm.hdsize_unit = 'PB' THEN pm.hdsize * 1024 * 1024
-                                           WHEN pm.hdsize_unit = 'EB' THEN pm.hdsize * 1024 * 1024 * 1024
-                                           WHEN pm.hdsize_unit = 'ZB' THEN pm.hdsize * 1024 * 1024 * 1024 * 1024
-                                           WHEN pm.hdsize_unit = 'YB' THEN pm.hdsize * 1024 * 1024 * 1024 * 1024 * 1024
-                                           ELSE NULL
-                                         END) AS total_part_disk_size
-                                     FROM view_part_v1 p
-                                     INNER JOIN view_partmodel_v1 pm ON p.partmodel_fk = pm.partmodel_pk
-                                     WHERE pm.type_id = 3 AND pm.hdsize IS NOT NULL AND p.pcount > 0 AND p.device_fk IS NOT NULL
-                                     GROUP BY p.device_fk
-                                 ) AS p ON view_device_v2.device_pk = p.device_fk
+                                case WHEN view_device_v2.type = 'Virtual' THEN view_device_v2.type WHEN view_device_v2.type = 'Cluster' THEN view_device_v2.type ELSE coalesce(view_hardware_v2.name, view_device_v2.type) END as name
+                                from view_device_v2 left join view_hardware_v2 on view_device_v2.hardware_fk = view_hardware_v2.hardware_pk
+                                left join view_vendor_v1 on vendor_pk=vendor_fk
+                            "
+                        />
+            </api>
+            <mapping callback="from_d42" key="name" doql-suffix=" where GREATEST(view_hardware_v2.last_changed, view_vendor_v1.last_changed, view_device_v2.last_changed) >'%s'">
+                <field resource="name" source-type="string" target="name" target-type="string" max-length="255" escape="true"/>
+                <field resource="manufacturer" source-type="string" target="manufacturer" target-type="string"
+                   not-null="true" set-space="true" min-length="1" max-length="255"/>
+            </mapping>
+        </task>
+
+        <task enable="false" name="Products" type="product" description="Copy Product info from Device42 to FreshService" d42_max_version="16.18.02">
+            <api>
+                <target model="products" target="freshservice" method="POST" update_method="PUT" path="api/v2/products" asset-type="Hardware"/>
+                <resource target="device42" method="POST"
+                          path="services/data/v1.0/query/"
+                          doql="
+                            select distinct
+                                view_vendor_v1.name as manufacturer,
+                                case WHEN view_device_v1.type = 'Virtual' THEN view_device_v1.type WHEN view_device_v1.type = 'Cluster' THEN view_device_v1.type ELSE coalesce(view_hardware_v1.name, view_device_v1.type) END as name
+                                from view_device_v1 left join view_hardware_v1 on view_device_v1.hardware_fk = view_hardware_v1.hardware_pk
+                                left join view_vendor_v1 on vendor_pk=vendor_fk
+                            "
+                        />
+            </api>
+            <mapping callback="from_d42" key="name" doql-suffix=" where GREATEST(view_hardware_v1.last_changed, view_vendor_v1.last_changed, view_device_v1.last_changed) >'%s'">
+                <field resource="name" source-type="string" target="name" target-type="string" max-length="255" escape="true"/>
+                <field resource="manufacturer" source-type="string" target="manufacturer" target-type="string"
+                   not-null="true" set-space="true" min-length="1" max-length="255"/>
+            </mapping>
+        </task>
+
+        <task enable="true" name="Devices" description="Copy Servers from Device42 to FreshService using DOQL v2" d42_min_version="16.19.00">
+            <api>
+                <target model="assets" target="freshservice" method="POST" update_method="PUT" path="api/v2/assets" />
+                <resource model="Devices" target="device42" method="POST"
+                          doql="
+                                WITH
+                                devicelastlogin AS (
+                                    with sub as ( SELECT dll.device_fk, dll.username, ROW_NUMBER() OVER(PARTITION BY dll.device_fk ORDER BY dll.last_login DESC) AS rank FROM view_devicelastlogin_v1 dll )
+                                    SELECT *   FROM sub  WHERE rank = 1 )
+
+                                ,alias as ( SELECT device_fk,  string_agg(alias_name, ', ' order by alias_name) as hostname FROM view_devicealias_v1 GROUP BY device_fk)
+
+                                ,assetlifecycle AS (
+                                    with sub as  (
+                                        SELECT alc.device_fk, alc.date,
+                                            ROW_NUMBER() OVER(PARTITION BY alc.device_fk ORDER BY alc.date DESC) AS rank
+                                        FROM view_assetlifecycle_v1 alc
+                                        INNER JOIN view_assetaction_v1 aaction ON alc.assetaction_fk = aaction.assetaction_pk WHERE aaction.name = 'Purchased')
+                                    SELECT *   FROM sub  WHERE rank = 1    )
+
+                                ,asset_endlifecycle AS (
+                                    with sub as  (
+                                        SELECT alc.device_fk, to_char(alc.date, 'YYYY-MM-DD') as date,
+                                            ROW_NUMBER() OVER(PARTITION BY alc.device_fk ORDER BY alc.date) AS rank
+                                        FROM view_assetlifecycle_v1 alc
+                                        INNER JOIN view_assetaction_v1 aaction ON alc.assetaction_fk = aaction.assetaction_pk WHERE aaction.name = 'Retired')
+                                    SELECT *   FROM sub  WHERE rank = 1    )
+
+                                ,warranty AS (
+                                    with sub as (
+                                                SELECT plid.device_fk, pli.start_date, pli.end_date,
+                                                    extract(year from age(pli.end_date, CASE WHEN lower(ven.name)='meraki' and pli.start_date='1970-01-01' THEN null else pli.start_date end)) warranty_years,
+                                                    extract(month from age(pli.end_date, CASE WHEN lower(ven.name)='meraki' and pli.start_date='1970-01-01' THEN null else pli.start_date end)) + case when extract(day from age(pli.end_date, CASE WHEN lower(ven.name)='meraki' and pli.start_date='1970-01-01' THEN null else pli.start_date end)) > 0 then 1 else 0 end  warranty_months,
+                                                    ven.name as purchase_order_vendor,
+                                                    ROW_NUMBER() OVER(PARTITION BY plid.device_fk ORDER BY pli.end_date DESC) AS rank
+                                                FROM view_purchaselineitems_to_devices_v1 plid
+                                                INNER JOIN view_purchaselineitem_v1 pli ON plid.purchaselineitem_fk = pli.purchaselineitem_pk
+                                                LEFT JOIN view_purchase_v1 pur ON pli.purchase_fk = pur.purchase_pk
+                                                LEFT JOIN view_vendor_v1 ven ON pur.vendor_fk=ven.vendor_pk
+                                                WHERE lower(pli.line_type) = 'contract'
+                                                    and ( lower(pli.contract_type_name) = 'warranty'
+                                                            or ( lower(pli.contract_type_name) in ('base', 'upgrade') and lower(ven.name) in ('ibm', 'lenovo'))
+                                                        )
+                                                      and pli.end_date is not null
+                                                )
+                                       SELECT *  FROM sub  WHERE rank = 1 )
+
+                                ,part_count as (
+                                    SELECT p.device_fk,
+                                         SUM(p.pcount *
+                                             CASE
+                                               WHEN pm.hdsize_unit = 'GB' THEN pm.hdsize
+                                               WHEN pm.hdsize_unit = 'TB' THEN pm.hdsize * 1024
+                                               WHEN pm.hdsize_unit = 'PB' THEN pm.hdsize * 1024 * 1024
+                                               WHEN pm.hdsize_unit = 'EB' THEN pm.hdsize * 1024 * 1024 * 1024
+                                               WHEN pm.hdsize_unit = 'ZB' THEN pm.hdsize * 1024 * 1024 * 1024 * 1024
+                                               WHEN pm.hdsize_unit = 'YB' THEN pm.hdsize * 1024 * 1024 * 1024 * 1024 * 1024
+                                               ELSE NULL
+                                             END) AS total_part_disk_size
+                                         FROM view_part_v1 p
+                                         INNER JOIN view_partmodel_v1 pm ON p.partmodel_fk = pm.partmodel_pk
+                                         WHERE pm.type_id = 3 AND pm.hdsize IS NOT NULL AND p.pcount > 0 AND p.device_fk IS NOT NULL
+                                         GROUP BY p.device_fk )
+
+                                ,network_port_count as (
+                                    SELECT p.device_fk,
+                                         count(*) AS total_port_count
+                                         from (
+                                            select device_fk, hwaddress from view_netport_v1 where device_fk is not null
+                                            union
+                                            select second_device_fk as device_fk, hwaddress from view_netport_v1 where second_device_fk is not null
+                                            ) p
+                                         WHERE p.device_fk is not null
+                                         GROUP BY p.device_fk )
+
+                                ,total_costs as (
+                                    select device_fk, sum(cost) as cost from view_purchaselineitem_v1 left join view_purchaselineitems_to_devices_v1 on purchaselineitem_fk = purchaselineitem_pk  group by device_fk)
+
+                                ,network_hw as (
+                                    select device_fk,
+                                        string_agg(
+                                            CASE
+                                                WHEN LENGTH(TRIM(netport.hwaddress)) = 12
+                                                THEN CONCAT_WS(':',left(TRIM(netport.hwaddress),2), substring(TRIM(netport.hwaddress),3,2), substring(TRIM(netport.hwaddress),5,2), substring(TRIM(netport.hwaddress),7,2), substring(TRIM(netport.hwaddress),9,2), right(TRIM(netport.hwaddress),2))
+                                                ELSE
+                                                    netport.hwaddress
+                                                END, ', '
+                                                order by netport.hwaddress) as hwaddress
+												from (
+													select device_fk, hwaddress from view_netport_v1 where device_fk is not null
+													union
+													select second_device_fk as device_fk, hwaddress from view_netport_v1 where second_device_fk is not null
+													) netport
+                                                where (netport.hwaddress is not null AND LENGTH(TRIM(netport.hwaddress)) > 0)
+                                                group by netport.device_fk    )
+
+                                ,network_ip as (
+                                    select
+                                        vip.device_fk,
+                                        string_agg(host(vip.ip_address)::character varying, ', ' order by vip.ip_address) as ip_address,
+                                        string_agg(case when vip.ip_address &lt;&lt; inet '10/8' or vip.ip_address &lt;&lt; inet '192/8' or vip.ip_address &lt;&lt; inet '172.16/12' then
+                                            host(vip.ip_address)::character varying
+                                            else null end, ', ' order by vip.ip_address) as private_ip_address,
+                                        string_agg(case when vip.ip_address &lt;&lt; inet '10/8' or vip.ip_address &lt;&lt; inet '192/8' or vip.ip_address &lt;&lt; inet '172.16/12' then null
+                                            else host(vip.ip_address)::character varying end, ', ' order by vip.ip_address) as public_ip_address,
+                                    	string_agg(host(vip.subnet_mask)::character varying, ', ' order by vip.ip_address) as subnet_mask
+                                        from (select distinct device_fk, ip_address, netmask(set_masklen(view_subnet_v1.network, view_subnet_v1.mask_bits)) as subnet_mask
+                                            from view_ipaddress_v1 left join view_subnet_v1 on view_ipaddress_v1.subnet_fk = view_subnet_v1.subnet_pk) vip group by vip.device_fk)
+
+                                ,subnet as (
+                                    select
+                                        vn.device_fk,
+                                        string_agg(host(vn.network)::character varying, ', ' order by vn.network) as network
+                                        from (select distinct device_fk, network from view_ipaddress_v1 left join view_subnet_v1 on subnet_pk=subnet_fk) vn group by vn.device_fk)
+
+                                ,vrfgroup as (
+                                    select
+                                        vn.device_fk,
+                                        string_agg(vn.vrfgroup, ', ' order by vn.vrfgroup) as vrfgroup
+                                        from (select distinct device_fk, view_vrfgroup_v1.name as vrfgroup from view_ipaddress_v1
+                                        left join view_subnet_v1 on subnet_pk=subnet_fk
+                                        left join view_vrfgroup_v1 on vrfgroup_pk=vrfgroup_fk) vn group by vn.device_fk)
+
+                                ,device_cluster AS (
+                                    SELECT device_cluster.child_device_fk device_fk,
+                                        string_agg(device_cluster.parent_device_name, ', ' order by device_cluster.parent_device_name) as device_cluster_name
+                                        FROM view_devices_in_cluster_v1 device_cluster group by device_cluster.child_device_fk)
+
+                                ,mount_point as (
+                                    select dr.device_fk, string_agg(resource.resource_name, ', ' order by resource.resource_name) as mountpoint
+                                    from view_deviceresource_v1 dr left join view_resource_v2 resource on resource.resource_pk=dr.resource_fk where dr.relation = 'Mountpoint' group by dr.device_fk)
+
+                                select view_device_v2.*,
+                                    case
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.physicalsubtype) = 'laptop' THEN 'Laptop'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.physicalsubtype) = 'workstation' THEN 'Desktop'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.physicalsubtype) = 'network printer' THEN 'Printer'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.physicalsubtype) = 'router' THEN 'Router'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.physicalsubtype) = 'firewall' THEN 'Firewall'
+                                        WHEN lower(view_device_v2.os_name) similar to '%(f5|netscaler)%' THEN 'Load Balancer'
+                                        WHEN view_device_v2.network_device THEN 'Switch'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.os_name) similar to '%(windows|microsoft)%' AND lower(view_device_v2.os_name) like '%server%' THEN 'Windows Server'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.os_name) similar to '%(unix|z/os|z os|zos|hp-ux|os400|os/400|os 400|linux|amazon|ubuntu|centos|redhat|debian|sles|suse|gentoo|oracle|freebsd|rhel|red hat|fedora|alma|rocky|arch)%' THEN 'Unix Server'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.os_name) similar to '%(aix)%' THEN 'AIX Server'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.os_name) similar to '%(solaris|sunos|sun os)%' THEN 'Solaris Server'
+                                        WHEN view_device_v2.virtual_host AND lower(view_device_v2.os_name) like '%esxi%' THEN 'VMware VCenter Host'
+                                        WHEN view_device_v2.virtual_host THEN 'Host'
+                                        WHEN lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'vmware' THEN 'VMware VCenter VM'
+                                        WHEN lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'amazon ec2 instance' THEN 'AWS VM'
+                                        WHEN lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'azure virtual machine' THEN 'Azure VM'
+                                        WHEN lower(view_device_v2.type) = 'physical' THEN 'Server'
+                                        WHEN lower(view_device_v2.type) = 'virtual' THEN 'Virtual Machine'
+                                        ELSE 'Computer'
+                                    END as asset_type,
+                                    coalesce(view_device_v2.physicalsubtype, view_device_v2.virtualsubtype) as device_subtype,
+                                    view_device_v2.core_per_cpu * view_device_v2.total_cpus as total_cpucore,
+                                    t_cost.cost,
+                                    case WHEN view_device_v2.type = 'Virtual' THEN view_device_v2.type WHEN view_device_v2.type = 'Cluster' THEN view_device_v2.type ELSE coalesce(view_hardware_v2.name, view_device_v2.type) END as hw_model,
+                                    case WHEN view_device_v2.hz = 'MHz' and view_device_v2.cpu_speed is not null  THEN view_device_v2.cpu_speed / 1000 ELSE view_device_v2.cpu_speed END as cpuspeed,
+                                    case
+                                        WHEN view_device_v2.ram_size_type = 'MB' and view_device_v2.ram is not null  THEN view_device_v2.ram / 1024
+                                        WHEN view_device_v2.ram_size_type = 'TB' and view_device_v2.ram is not null  THEN view_device_v2.ram * 1024
+                                        ELSE view_device_v2.ram END as ramsize,
+                                    network_ip.ip_address,
+                                    network_ip.public_ip_address,
+                                    network_ip.private_ip_address,
+                                    network_ip.subnet_mask,
+                                    network_hw.hwaddress,
+                                    CEIL(COALESCE(p.total_part_disk_size,
+                                                    CASE
+                                                        WHEN view_device_v2.hard_disk_count IS NOT NULL AND
+                                                             view_device_v2.hard_disk_size IS NOT NULL AND
+                                                             view_device_v2.hard_disk_size_type IS NOT NULL THEN
+                                                                view_device_v2.hard_disk_count *
+                                                                CASE
+                                                                    WHEN view_device_v2.hard_disk_size_type = 'GB' THEN view_device_v2.hard_disk_size
+                                                                    WHEN view_device_v2.hard_disk_size_type = 'TB' THEN view_device_v2.hard_disk_size * 1024
+                                                                    WHEN view_device_v2.hard_disk_size_type = 'PB' THEN view_device_v2.hard_disk_size * 1024 * 1024
+                                                                    ELSE NULL
+                                                                END
+                                                        ELSE NULL
+                                                    END)) AS disk_size,
+                                    warranty.warranty_months + (warranty.warranty_years * 12) as warranty_months,
+                                    warranty.end_date as warranty_end_date,
+                                    warranty.purchase_order_vendor as purchase_order_vendor,
+                                    assetlifecycle.date as acquisition_date,
+                                    asset_endlifecycle.date as end_of_life,
+                                    case when lower(view_device_v2.os_name) like '%windows%' or lower(view_device_v2.os_name) like '%microsoft%' then view_device_v2.os_version_no else view_device_v2.os_version end as device_os_version,
+                                    case when lower(view_device_v2.os_name) like '%windows%' or lower(view_device_v2.os_name) like '%microsoft%' then view_device_v2.os_version else view_device_v2.os_version_no end as device_os_version_no,
+                                    alias.hostname as hostname,
+                                    devicelastlogin.username as last_login_by,
+                                    ci.location as cloud_instance_region,
+                                    ci.location as cloud_instance_location,
+                                    ci.instance_type as cloud_instance_type,
+                                    ci.account as cloud_account,
+                                    ci.image_id as cloud_image_id,
+                                    ci.os_platform as cloud_os_platform,
+                                    subnet.network as subnet,
+                                    vrfgroup.vrfgroup as vrfgroup,
+                                    case
+                                        WHEN (lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'amazon ec2 instance')
+                                            or lower(civ.name) similar to '%(aws|amazon)%' THEN 'AWS'
+                                        WHEN (lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'azure virtual machine')
+                                            or lower(civ.name) similar to '%(azure|microsoft)%' THEN 'AZURE'
+                                        WHEN (lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'vmware')
+                                            or lower(civ.name) like '%vmware%'
+                                            or (view_device_v2.virtual_host and lower(view_device_v2.os_name) like '%esxi%') then 'VMWARE VCENTER'
+                                        WHEN (lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'gce')
+                                            or lower(civ.name) similar to '%(google|gce|gcp)%' then 'GCP'
+                                        WHEN (lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'oracle cloud instance')
+                                            or lower(civ.name) like '%oracle%' then 'Oracle Cloud'
+                                        WHEN (lower(view_device_v2.type) = 'virtual' AND (lower(view_device_v2.virtualsubtype) = 'citrix/xen'
+                                                or lower(view_device_v2.virtualsubtype) = 'xen'))
+                                            or lower(civ.name) similar to '%(citrix|xen)%'
+                                            or (view_device_v2.virtual_host and lower(view_device_v2.os_name) like '%xenserver%') then 'Citrix'
+                                        WHEN (lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'hyper-v')
+                                            or (view_device_v2.virtual_host and lower(view_device_v2.os_name) similar to '%(windows|microsoft)%' AND lower(view_device_v2.os_name) like '%server%') then 'Hyper-V'
+                                        WHEN (lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'digitalocean instance')
+                                            or lower(civ.name) similar to '%(digitalocean|digital ocean)%' then 'Digital Ocean'
+                                        WHEN (lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'alibaba cloud instance')
+                                            or lower(civ.name) like '%alibaba%' then 'Alibaba Cloud'
+                                        else null
+                                    end as cloud_vendor,
+                                    ci.instance_id as cloud_instance_id,
+                                    ci.instance_name as cloud_instance_name,
+                                    ci.status as cloud_instance_status,
+                                    device_cluster.device_cluster_name as device_cluster_name,
+                                    mount_point.mountpoint as mountpoint,
+                                    CONCAT_WS(' ',  view_device_v2.os_name, view_device_v2.os_version, view_device_v2.os_version_no) as hypervisor,
+                                    hv.name as hardware_vendor,
+                                    virtual_host_device.datacenter as host_datacenter,
+                                    host_device_cluster.device_cluster_name as host_cluster_name,
+                                	case when view_device_v2.name ~* '^((?!-)[A-Za-z0-9-]{{1,63}}(?&lt;!-)\.)+[A-Za-z]{{2,6}}$' then substring(view_device_v2.name, position('.' in view_device_v2.name)+1)
+	                                else null end domain_name,
+	                                network_port_count.total_port_count as total_port_count
+
+                                FROM view_device_v2
+                                LEFT JOIN view_hardware_v2          on view_device_v2.hardware_fk   = view_hardware_v2.hardware_pk
+                                LEFT JOIN network_ip                on view_device_v2.device_pk     = network_ip.device_fk
+                                LEFT JOIN network_hw                on view_device_v2.device_pk     = network_hw.device_fk
+                                LEFT JOIN total_costs t_cost        on t_cost.device_fk             = device_pk
+                                LEFT OUTER JOIN part_count AS p     ON view_device_v2.device_pk     = p.device_fk
+                                LEFT OUTER JOIN warranty            ON view_device_v2.device_pk     = warranty.device_fk
+                                LEFT OUTER JOIN assetlifecycle      ON view_device_v2.device_pk     = assetlifecycle.device_fk
+                                LEFT OUTER JOIN asset_endlifecycle  ON view_device_v2.device_pk     = asset_endlifecycle.device_fk
+                                LEFT OUTER JOIN alias               ON view_device_v2.device_pk     = alias.device_fk
+                                LEFT OUTER JOIN devicelastlogin     ON view_device_v2.device_pk     = devicelastlogin.device_fk
+                                LEFT JOIN view_cloudinstance_v1 as ci     ON view_device_v2.device_pk     = ci.device_fk
+                                LEFT JOIN view_vendor_v1 as civ     ON ci.vendor_fk     = civ.vendor_pk
+                                LEFT JOIN device_cluster            ON view_device_v2.device_pk     = device_cluster.device_fk
+                                LEFT JOIN mount_point               ON view_device_v2.device_pk     = mount_point.device_fk
+                                LEFT JOIN view_vendor_v1 as hv     ON view_hardware_v2.vendor_fk     = hv.vendor_pk
+                                LEFT JOIN view_device_v2 as virtual_host_device     ON view_device_v2.virtual_host_device_fk     = virtual_host_device.device_pk
+                                LEFT JOIN device_cluster as host_device_cluster     ON virtual_host_device.device_pk     = host_device_cluster.device_fk
+                                LEFT JOIN subnet            ON view_device_v2.device_pk     = subnet.device_fk
+                                LEFT JOIN vrfgroup            ON view_device_v2.device_pk     = vrfgroup.device_fk
+                                LEFT JOIN network_port_count        ON view_device_v2.device_pk     = network_port_count.device_fk
                                "
                         />
             </api>
 
-            <mapping callback="from_d42" key="name" source="Devices">
+            <mapping callback="from_d42" key="name" source="Devices" doql-suffix=" where view_device_v2.last_edited>'%s' ">
+                <!--  General -->
+                <field resource="asset_no" source-type="string" target="asset_tag" target-type="string"
+                       target-header="General" not-null="true" min-length="1" max-length="255"/>
+                <field resource="name" source-type="string" target="name" target-type="string" target-header="General"
+                       set-space="true" min-length="1" max-length="248" escape="true"/>
+                <field resource="notes" source-type="string" target="description" target-header="General"
+                       not-null="true" set-space="true" min-length="1" max-length="60000"/>
+                <field resource="end_of_life" source-type="string" target="end_of_life" target-type="date"
+                       target-header="General"/>
+                <!--  ~General -->
+
+                <!--  Hardware -->
                 <field resource="in_service" source-type="boolean" target="asset_state" target-type="string"
                        target-header="Hardware">
                     <value-mapping default="Retired">
                         <item key="true" value="In Use"/>
                     </value-mapping>
                 </field>
-                <field resource="asset_no" source-type="string" target="asset_tag" target-type="string"
-                       target-header="General" not-null="true" min-length="1" max-length="255"/>
-                <field resource="name" source-type="string" target="name" target-type="string" target-header="General"
-                       set-space="true" min-length="1" max-length="248"/>
-                <field resource="type" source-type="string" target="asset_type_id" target-type="string"
-                       target-header="General"
-                       target-foregin="asset_types" target-foregin-key="name" target-field="asset_type_id">
-                    <value-mapping default="Server">
-                        <item key="Physical" value="Server"/>
-                        <item key="Virtual" value="Server"/>
-                        <item key="Cluster" value="Server"/>
-                        <item key="Unknown" value="Server"/>
-                    </value-mapping>
-                </field>
-                <field resource="notes" source-type="string" target="description" target-header="General"
-                       not-null="true" set-space="true" min-length="1" max-length="60000"/>
+                <field resource="hw_model" source-type="string" target="product" target-type="string"
+                       target-header="Hardware"
+                       target-foregin="products" target-foregin-key="name" not-null="true" required="True" max-length="255"/>
+                <field resource="serial_no" source-type="string" target="serial_number" target-type="string"
+                       target-header="Hardware" not-null="true" set-space="true"
+                       min-length="1" max-length="255" error-skip="true"/>
+                <field resource="warranty_months" source-type="integer" target="warranty" target-type="integer"
+                       target-header="Hardware" not-null="true"/>
+                <field resource="warranty_end_date" source-type="string" target="warranty_expiry_date" target-type="date"
+                       target-header="Hardware" not-null="true"/>
+                <field resource="acquisition_date" source-type="string" target="acquisition_date" target-type="date"
+                       target-header="Hardware" not-null="true"/>
+                <field resource="domain_name" source-type="string" target="domain" target-type="string"
+                       target-header="Hardware" not-null="true" required="True" max-length="255"
+                />
+                <field resource="last_discovered" source-type="string" target="last_audit_date" target-type="date"
+                       target-header="Hardware" not-null="true"/>
+                <!-- Temporally don't map the vendor, because there is no way to sync the products and vendors using api right now.
+                <field resource="purchase_order_vendor" source-type="string" target="vendor" target-type="string"
+                       target-header="Hardware"
+                       target-foregin="vendors" target-foregin-key="name" not-null="true" required="True" max-length="255"/>
+                       -->
+                <!--  ~Hardware -->
+
+                <!--  Cost -->
+                <field resource="cost" type="float" target="cost"
+                       target-header="Cost" target-type="float" not-null="true" set-zero="true"/>
+                <!--  ~Cost -->
+
+                <!--  Computer -->
                 <field resource="uuid" type="string" target="uuid"
                        target-header="Computer" not-null="true" set-space="true"
                        min-length="1" max-length="255"/>
-                <field resource="cost" type="float" target="cost"
-                       target-header="Cost" target-type="float" not-null="true" set-zero="true"/>
                 <field resource="ip_address" type="string" target="computer_ip_address"
                        target-header="Computer" not-null="true" max-length="255"/>
                 <field resource="hwaddress" type="string" target="mac_address"
                        target-header="Computer" not-null="true" max-length="255"/>
                 <field resource="os_name" source-type="string" target="os" target-type="string"
                        target-header="Computer" not-null="true" set-space="true" min-length="1" max-length="255"/>
-                <field resource="os_version" source-type="string" target="os_version" target-type="string"
+                <field resource="device_os_version" source-type="string" target="os_version" target-type="string"
+                       target-header="Computer" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="device_os_version_no" source-type="string" target="os_service_pack" target-type="string"
+                       target-header="Computer" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="hostname" source-type="string" target="hostname" target-type="string"
+                       target-header="Computer" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="last_login_by" source-type="string" target="last_login_by" target-type="string"
                        target-header="Computer" not-null="true" set-space="true" min-length="1" max-length="255"/>
                 <field resource="cpuspeed" source-type="float" target="cpu_speed" target-type="float"
                        target-header="Computer" not-null="true"/>
                 <field resource="total_cpucore" source-type="integer" target="cpu_core_count" target-type="integer"
                        not-null="true"
                        target-header="Computer"/>
-                <field resource="hw_model" source-type="string" target="product" target-type="string"
-                       target-header="Hardware"
-                       target-foregin="products" target-foregin-key="name" not-null="true" required="True" max-length="255"/>
-                <field resource="serial_no" source-type="string" target="serial_number" target-type="string"
-                       target-header="Hardware" not-null="true" set-space="true"
-                       min-length="1" max-length="255" error-skip="true"/>
                 <field resource="ramsize" source-type="float" target="memory" target-type="float"
                        target-header="Computer" not-null="true" />
                 <field resource="disk_size" source-type="integer" target="disk_space" target-type="integer"
                        target-header="Computer" not-null="true" />
+                <!--  ~Computer -->
+
+                <!--  Cloud -->
+                <field resource="cost" type="float" target="cloud_cost"
+                       target-header="Cloud" target-type="float" not-null="true" set-zero="true"/>
+                <field resource="cloud_instance_region" source-type="string" target="region" target-type="dropdown"
+                       target-header="Cloud" not-null="true" min-length="1" max-length="255"/>
+                <field resource="cloud_instance_location" source-type="string" target="cd_availability_zone" target-type="dropdown"
+                       target-header="Cloud" not-null="true" min-length="1" max-length="255"/>
+                <field resource="cloud_vendor" source-type="string" target="provider_type" target-type="string"
+                       target-header="Cloud" not-null="true"/>
+                <field resource="last_discovered" source-type="string" target="cloud_last_audit_date" target-type="date"
+                       target-header="Cloud" not-null="true"/>
+                <!--  ~Cloud -->
+
+                <!--  Host -->
+                <field resource="cloud_instance_id" source-type="string" target="item_id" target-type="string"
+                       target-header="Host" not-null="true" error-skip="true"/>
+                <field resource="cloud_instance_name" source-type="string" target="item_name" target-type="string"
+                       target-header="Host" not-null="true"/>
+                <field resource="ramsize" source-type="float" target="memory_size" target-type="float"
+                       target-header="Host" not-null="true" />
+                <field resource="total_cpucore" source-type="integer" target="cpu_core_count" target-type="integer"
+                       not-null="true"
+                       target-header="Host"/>
+                <field resource="disk_size" source-type="integer" target="total_disk_size" target-type="integer"
+                       target-header="Host" not-null="true" />
+                <field resource="cloud_instance_status" source-type="string" target="state" target-type="string"
+                       target-header="Host">
+                    <value-mapping default="Unknown">
+                        <item key="Running" value="Powered On"/>
+                        <item key="Stopped" value="Powered Off"/>
+                    </value-mapping>
+                </field>
+                <field resource="ip_address" type="string" target="ip_address"
+                       target-header="Host" not-null="true" max-length="255"/>
+                <!--  ~Host -->
+
+                <!--  VMware VCenter Host -->
+                <field resource="datacenter" type="string" target="datacenter"
+                       target-header="VMware VCenter Host" not-null="true" max-length="255"/>
+                <field resource="device_cluster_name" type="string" target="cluster"
+                       target-header="VMware VCenter Host" not-null="true" max-length="255"/>
+                <field resource="mountpoint" type="string" target="datastore"
+                       target-header="VMware VCenter Host" not-null="true" max-length="255"/>
+                <field resource="hypervisor" type="string" target="hypervisor"
+                       target-header="VMware VCenter Host" not-null="true" max-length="255"/>
+                <field resource="cpuspeed" source-type="float" target="cpu_speed" target-type="float"
+                       target-header="VMware VCenter Host" not-null="true"/>
+                <field resource="os_name" source-type="string" target="os_type" target-type="string"
+                       target-header="VMware VCenter Host" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="uuid" type="string" target="instance_uuid"
+                       target-header="VMware VCenter Host" not-null="true" set-space="true"
+                       min-length="1" max-length="255"/>
+                <field resource="serial_no" source-type="string" target="cd_serial_number" target-type="string"
+                       target-header="VMware VCenter Host" not-null="true" set-space="true"
+                       min-length="1" max-length="255" error-skip="true"/>
+                <field resource="hardware_vendor" source-type="string" target="hardware_vendor" target-type="string"
+                       target-header="VMware VCenter Host" not-null="true" set-space="true"
+                       min-length="1" max-length="255" error-skip="true"/>
+                <!--  ~VMware VCenter Host -->
+
+                <!--  Virtual Machine -->
+                <field resource="cloud_instance_id" source-type="string" target="item_id" target-type="string"
+                       target-header="Virtual Machine" not-null="true" error-skip="true"/>
+                <field resource="cloud_instance_name" source-type="string" target="item_name" target-type="string"
+                       target-header="Virtual Machine" not-null="true"/>
+                <field resource="cloud_instance_type" source-type="string" target="cd_instance_type" target-type="dropdown"
+                       target-header="Virtual Machine" not-null="true" min-length="1" max-length="255"/>
+                <field resource="public_ip_address" type="string" target="public_address"
+                       target-header="Virtual Machine" not-null="true" max-length="255"/>
+                <field resource="private_ip_address" type="string" target="private_address"
+                       target-header="Virtual Machine" not-null="true" max-length="255"/>
+                <field resource="cloud_instance_status" source-type="string" target="vm_state" target-type="string"
+                       target-header="Virtual Machine">
+                    <value-mapping default="Unknown">
+                        <item key="Running" value="Running"/>
+                        <item key="Stopped" value="Stopped"/>
+                    </value-mapping>
+                </field>
+                <field resource="os_name" source-type="string" target="os_name" target-type="string"
+                       target-header="Virtual Machine" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <!-- ~Virtual Machine -->
+
+                <!-- VMWare VCenter VM -->
+                <field resource="hostname" source-type="string" target="hostname" target-type="string"
+                       target-header="VMware VCenter VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="mountpoint" type="string" target="datastore"
+                       target-header="VMware VCenter VM" not-null="true" max-length="255"/>
+                <field resource="ramsize" source-type="float" target="memory_size" target-type="float"
+                       target-header="VMware VCenter VM" not-null="true" />
+                <field resource="total_cpucore" source-type="integer" target="num_of_cpu" target-type="integer"
+                       not-null="true"
+                       target-header="VMware VCenter VM"/>
+                <field resource="uuid" type="string" target="instance_uuid"
+                       target-header="VMware VCenter VM" not-null="true" set-space="true"
+                       min-length="1" max-length="255"/>
+                <field resource="host_datacenter" source-type="string" target="datacenter" target-type="string"
+                       target-header="VMware VCenter VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="host_cluster_name" source-type="string" target="cluster" target-type="string"
+                       target-header="VMware VCenter VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <!-- ~VMWare VCenter VM -->
+
+                <!-- AWS VM -->
+                <field resource="cloud_account" source-type="string" target="account_id" target-type="integer"
+                       target-header="AWS VM" not-null="true"/>
+                <field resource="cloud_instance_id" source-type="string" target="cd_instance_id" target-type="string"
+                       target-header="AWS VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="cloud_image_id" source-type="string" target="image_id" target-type="string"
+                       target-header="AWS VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="cloud_os_platform" source-type="string" target="platform" target-type="dropdown"
+                       target-header="AWS VM"/>
+                <field resource="subnet" source-type="string" target="subnet_id" target-type="string"
+                       target-header="AWS VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="vrfgroup" source-type="string" target="vpc_id" target-type="string"
+                       target-header="AWS VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <!-- ~AWS VM -->
+
+                <!-- Azure VM -->
+                <field resource="cloud_account" source-type="string" target="subscription_id" target-type="string"
+                       target-header="Azure VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="hostname" source-type="string" target="computer_name" target-type="string"
+                       target-header="Azure VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <!-- ~Azure VM -->
+
+                <!-- Printer -->
+                <field resource="ip_address" type="string" target="ip_address"
+                       target-header="Printer" not-null="true" max-length="255"/>
+                <field resource="hwaddress" type="string" target="mac_address"
+                       target-header="Printer" not-null="true" max-length="255"/>
+                <field resource="subnet_mask" type="string" target="subnet_mask"
+                       target-header="Printer" not-null="true" max-length="255"/>
+                <!-- ~Printer -->
+
+                <!-- Router -->
+                <field resource="os_name" source-type="string" target="firmware" target-type="string"
+                       target-header="Router" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="os_version" source-type="string" target="firmware_version" target-type="string"
+                       target-header="Router" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="ip_address" type="string" target="ip_address"
+                       target-header="Router" not-null="true" max-length="255"/>
+                <field resource="total_port_count" source-type="integer" target="ports" target-type="integer"
+                       target-header="Router" not-null="true"/>
+                <field resource="hwaddress" type="string" target="mac_address"
+                       target-header="Router" not-null="true" max-length="255"/>
+                <field resource="subnet_mask" type="string" target="subnet_mask"
+                       target-header="Router" not-null="true" max-length="255"/>
+                <!-- ~Router -->
+
+                <!-- Firewall -->
+                <field resource="os_name" source-type="string" target="firmware" target-type="string"
+                       target-header="Firewall" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="os_version" source-type="string" target="firmware_version" target-type="string"
+                       target-header="Firewall" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="ip_address" type="string" target="ip_address"
+                       target-header="Firewall" not-null="true" max-length="255"/>
+                <field resource="total_port_count" source-type="integer" target="ports" target-type="integer"
+                       target-header="Firewall" not-null="true"/>
+                <field resource="hwaddress" type="string" target="mac_address"
+                       target-header="Firewall" not-null="true" max-length="255"/>
+                <field resource="subnet_mask" type="string" target="subnet_mask"
+                       target-header="Firewall" not-null="true" max-length="255"/>
+                <!-- ~Firewall -->
+
+                <!--  Load Balancer -->
+                <field resource="cloud_instance_id" source-type="string" target="item_id" target-type="string"
+                       target-header="Load Balancer" not-null="true" error-skip="true"/>
+                <field resource="cloud_instance_name" source-type="string" target="item_name" target-type="string"
+                       target-header="Load Balancer" not-null="true"/>
+                <!--  ~Load Balancer -->
+
+                <!-- Switch -->
+                <field resource="os_name" source-type="string" target="firmware" target-type="string"
+                       target-header="Switch" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="os_version" source-type="string" target="firmware_version" target-type="string"
+                       target-header="Switch" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="ip_address" type="string" target="ip_address"
+                       target-header="Switch" not-null="true" max-length="255"/>
+                <field resource="total_port_count" source-type="integer" target="ports" target-type="integer"
+                       target-header="Switch" not-null="true"/>
+                <field resource="hwaddress" type="string" target="mac_address"
+                       target-header="Switch" not-null="true" max-length="255"/>
+                <field resource="subnet_mask" type="string" target="subnet_mask"
+                       target-header="Switch" not-null="true" max-length="255"/>
+                <!-- ~Switch -->
             </mapping>
+            <unmapping callback="from_d42" key="name" source="Devices" doql-suffix=" where view_device_v2.name='%s'">
+                <field resource="network_device" source-type="boolean" display-name="Network Device"/>
+                <field resource="blade_chassis" source-type="boolean" display-name="Blade Chassis"/>
+                <field resource="device_subtype" source-type="string" display-name="Device Subtype"/>
+            </unmapping>
             <d42url resource="device_pk" source-type="integer" url="{0}/admin/rackraj/device/{1}/" />
         </task>
 
-        <task enable="false" description="Copy Servers from Device42 to FreshService using DOQL v1" d42_max_version="16.18.02">
+        <task enable="false" name="Devices" description="Copy Servers from Device42 to FreshService using DOQL v1" d42_max_version="16.18.02">
             <api>
-                <target model="assets" target="freshservice" method="POST" update_method="PUT" path="api/v2/assets"
-                        asset-type="Server"/>
+                <target model="assets" target="freshservice" method="POST" update_method="PUT" path="api/v2/assets"/>
                 <resource model="Devices" target="device42" method="POST"
-                          path="services/data/v1.0/query/"
                           doql="
+                                WITH
+                                devicelastlogin AS (
+                                    with sub as ( SELECT dll.device_fk, dll.username, ROW_NUMBER() OVER(PARTITION BY dll.device_fk ORDER BY dll.last_login DESC) AS rank FROM view_devicelastlogin_v1 dll )
+                                    SELECT *   FROM sub  WHERE rank = 1 )
+
+                                ,alias as ( SELECT device_fk,  string_agg(alias_name, ', ' order by alias_name) as hostname FROM view_devicealias_v1 GROUP BY device_fk)
+
+                                ,assetlifecycle AS (
+                                    with sub as  (
+                                        SELECT alc.device_fk, alc.date,
+                                            ROW_NUMBER() OVER(PARTITION BY alc.device_fk ORDER BY alc.date DESC) AS rank
+                                        FROM view_assetlifecycle_v1 alc
+                                        INNER JOIN view_assetaction_v1 aaction ON alc.assetaction_fk = aaction.assetaction_pk WHERE aaction.name = 'Purchased')
+                                    SELECT *   FROM sub  WHERE rank = 1    )
+
+                                ,asset_endlifecycle AS (
+                                    with sub as  (
+                                        SELECT alc.device_fk, to_char(alc.date, 'YYYY-MM-DD') as date,
+                                            ROW_NUMBER() OVER(PARTITION BY alc.device_fk ORDER BY alc.date) AS rank
+                                        FROM view_assetlifecycle_v1 alc
+                                        INNER JOIN view_assetaction_v1 aaction ON alc.assetaction_fk = aaction.assetaction_pk WHERE aaction.name = 'Retired')
+                                    SELECT *   FROM sub  WHERE rank = 1    )
+
+                                ,warranty AS (
+                                    with sub as (
+                                                SELECT plid.device_fk, pli.start_date, pli.end_date,
+                                                    extract(year from age(pli.end_date, CASE WHEN lower(ven.name)='meraki' and pli.start_date='1970-01-01' THEN null else pli.start_date end)) warranty_years,
+                                                    extract(month from age(pli.end_date, CASE WHEN lower(ven.name)='meraki' and pli.start_date='1970-01-01' THEN null else pli.start_date end)) + case when extract(day from age(pli.end_date, CASE WHEN lower(ven.name)='meraki' and pli.start_date='1970-01-01' THEN null else pli.start_date end)) > 0 then 1 else 0 end  warranty_months,
+                                                    ven.name as purchase_order_vendor,
+                                                    ROW_NUMBER() OVER(PARTITION BY plid.device_fk ORDER BY pli.end_date DESC) AS rank
+                                                FROM view_purchaselineitems_to_devices_v1 plid
+                                                INNER JOIN view_purchaselineitem_v1 pli ON plid.purchaselineitem_fk = pli.purchaselineitem_pk
+                                                LEFT JOIN view_purchase_v1 pur ON pli.purchase_fk = pur.purchase_pk
+                                                LEFT JOIN view_vendor_v1 ven ON pur.vendor_fk=ven.vendor_pk
+                                                WHERE lower(pli.line_type) = 'contract'
+                                                    and ( lower(pli.contract_type_name) = 'warranty'
+                                                            or ( lower(pli.contract_type_name) in ('base', 'upgrade') and lower(ven.name) in ('ibm', 'lenovo'))
+                                                        )
+                                                      and pli.end_date is not null
+                                                )
+                                       SELECT *  FROM sub  WHERE rank = 1 )
+
+                                ,part_count as (
+                                    SELECT p.device_fk,
+                                         SUM(p.pcount *
+                                             CASE
+                                               WHEN pm.hdsize_unit = 'GB' THEN pm.hdsize
+                                               WHEN pm.hdsize_unit = 'TB' THEN pm.hdsize * 1024
+                                               WHEN pm.hdsize_unit = 'PB' THEN pm.hdsize * 1024 * 1024
+                                               WHEN pm.hdsize_unit = 'EB' THEN pm.hdsize * 1024 * 1024 * 1024
+                                               WHEN pm.hdsize_unit = 'ZB' THEN pm.hdsize * 1024 * 1024 * 1024 * 1024
+                                               WHEN pm.hdsize_unit = 'YB' THEN pm.hdsize * 1024 * 1024 * 1024 * 1024 * 1024
+                                               ELSE NULL
+                                             END) AS total_part_disk_size
+                                         FROM view_part_v1 p
+                                         INNER JOIN view_partmodel_v1 pm ON p.partmodel_fk = pm.partmodel_pk
+                                         WHERE pm.type_id = 3 AND pm.hdsize IS NOT NULL AND p.pcount > 0 AND p.device_fk IS NOT NULL
+                                         GROUP BY p.device_fk )
+
+                                ,network_port_count as (
+                                    SELECT p.device_fk,
+                                         count(*) AS total_port_count
+                                         from (
+                                            select device_fk, hwaddress from view_netport_v1 where device_fk is not null
+                                            union
+                                            select second_device_fk as device_fk, hwaddress from view_netport_v1 where second_device_fk is not null
+                                            ) p
+                                         WHERE p.device_fk is not null
+                                         GROUP BY p.device_fk )
+
+                                ,total_costs as (
+                                    select device_fk, sum(cost) as cost from view_purchaselineitem_v1 left join view_purchaselineitems_to_devices_v1 on purchaselineitem_fk = purchaselineitem_pk  group by device_fk)
+
+                                ,network_hw as (
+                                    select device_fk,
+                                        string_agg(
+                                            CASE
+                                                WHEN LENGTH(TRIM(netport.hwaddress)) = 12
+                                                THEN CONCAT_WS(':',left(TRIM(netport.hwaddress),2), substring(TRIM(netport.hwaddress),3,2), substring(TRIM(netport.hwaddress),5,2), substring(TRIM(netport.hwaddress),7,2), substring(TRIM(netport.hwaddress),9,2), right(TRIM(netport.hwaddress),2))
+                                                ELSE
+                                                    netport.hwaddress
+                                                END, ', '
+                                                order by netport.hwaddress) as hwaddress
+												from (
+													select device_fk, hwaddress from view_netport_v1 where device_fk is not null
+													union
+													select second_device_fk as device_fk, hwaddress from view_netport_v1 where second_device_fk is not null
+													) netport
+                                                where (netport.hwaddress is not null AND LENGTH(TRIM(netport.hwaddress)) > 0)
+                                                group by netport.device_fk    )
+
+                                ,network_ip as (
+                                    select
+                                        vip.device_fk,
+                                        string_agg(host(vip.ip_address)::character varying, ', ' order by vip.ip_address) as ip_address,
+                                        string_agg(case when vip.ip_address &lt;&lt; inet '10/8' or vip.ip_address &lt;&lt; inet '192/8' or vip.ip_address &lt;&lt; inet '172.16/12' then
+                                            host(vip.ip_address)::character varying
+                                            else null end, ', ' order by vip.ip_address) as private_ip_address,
+                                        string_agg(case when vip.ip_address &lt;&lt; inet '10/8' or vip.ip_address &lt;&lt; inet '192/8' or vip.ip_address &lt;&lt; inet '172.16/12' then null
+                                            else host(vip.ip_address)::character varying end, ', ' order by vip.ip_address) as public_ip_address,
+                                        string_agg(host(vip.subnet_mask)::character varying, ', ' order by vip.ip_address) as subnet_mask
+                                        from (select distinct device_fk, ip_address, netmask(set_masklen(view_subnet_v1.network, view_subnet_v1.mask_bits)) as subnet_mask
+                                            from view_ipaddress_v1 left join view_subnet_v1 on view_ipaddress_v1.subnet_fk = view_subnet_v1.subnet_pk) vip group by vip.device_fk)
+
+                                ,subnet as (
+                                    select
+                                        vn.device_fk,
+                                        string_agg(host(vn.network)::character varying, ', ' order by vn.network) as network
+                                        from (select distinct device_fk, network from view_ipaddress_v1 left join view_subnet_v1 on subnet_pk=subnet_fk) vn group by vn.device_fk)
+
+                                ,vrfgroup as (
+                                    select
+                                        vn.device_fk,
+                                        string_agg(vn.vrfgroup, ', ' order by vn.vrfgroup) as vrfgroup
+                                        from (select distinct device_fk, view_vrfgroup_v1.name as vrfgroup from view_ipaddress_v1
+                                        left join view_subnet_v1 on subnet_pk=subnet_fk
+                                        left join view_vrfgroup_v1 on vrfgroup_pk=vrfgroup_fk) vn group by vn.device_fk)
+
+                                ,device_cluster AS (
+                                    SELECT device_cluster.child_device_fk device_fk,
+                                        string_agg(device_cluster.parent_device_name, ', ' order by device_cluster.parent_device_name) as device_cluster_name
+                                        FROM view_devices_in_cluster_v1 device_cluster group by device_cluster.child_device_fk)
+
+                                ,mount_point as (
+                                    select mp.device_fk,  string_agg(mp.mountpoint, ', ' order by mp.mountpoint) as mountpoint from view_mountpoint_v1 mp group by mp.device_fk)
+
                                 select view_device_v1.*,
-                                cpucount * cpucore as total_cpucore,
-                                t_cost.cost,
-                                view_vendor_v1.name as manufacturer,
-                                case WHEN view_device_v1.type = 'Virtual' THEN view_device_v1.type WHEN view_device_v1.type = 'Cluster' THEN view_device_v1.type ELSE coalesce(view_hardware_v1.name, view_device_v1.type) END as hw_model,
-                                case WHEN view_device_v1.hz = 'MHz' and view_device_v1.cpupower is not null  THEN view_device_v1.cpupower / 1000 ELSE view_device_v1.cpupower END as cpuspeed,
-                                case WHEN view_device_v1.ram_size_type = 'MB' and view_device_v1.ram is not null  THEN view_device_v1.ram / 1024 WHEN view_device_v1.ram_size_type = 'TB' and view_device_v1.ram is not null  THEN view_device_v1.ram * 1024 ELSE view_device_v1.ram END as ramsize,
-                                network_ip.ip_address, network_hw.hwaddress,
-                                CEIL(COALESCE(p.total_part_disk_size,
-                                                CASE
-                                                    WHEN view_device_v1.hard_disk_count IS NOT NULL AND
-                                                         view_device_v1.hard_disk_size IS NOT NULL AND
-                                                         view_device_v1.hard_disk_size_type IS NOT NULL THEN
-                                                            view_device_v1.hard_disk_count *
-                                                            CASE
-                                                                WHEN view_device_v1.hard_disk_size_type = 'GB' THEN view_device_v1.hard_disk_size
-                                                                WHEN view_device_v1.hard_disk_size_type = 'TB' THEN view_device_v1.hard_disk_size * 1024
-                                                                WHEN view_device_v1.hard_disk_size_type = 'PB' THEN view_device_v1.hard_disk_size * 1024 * 1024
-                                                                ELSE NULL
-                                                            END
-                                                    ELSE NULL
-                                                END)) AS disk_size
-                                from view_device_v1 left join view_hardware_v1 on view_device_v1.hardware_fk = view_hardware_v1.hardware_pk left join  (select view_ipaddress_v1.device_fk,  string_agg(host(view_ipaddress_v1.ip_address)::character varying, ', ' order by view_ipaddress_v1.ip_address) as ip_address from view_ipaddress_v1 group by view_ipaddress_v1.device_fk) network_ip on view_device_v1.device_pk=network_ip.device_fk
-                                left join (select device_fk, string_agg(
-                                    CASE
-                                        WHEN LENGTH(TRIM(view_netport_v1.hwaddress)) = 12
-                                        THEN CONCAT_WS(':',left(TRIM(view_netport_v1.hwaddress),2), substring(TRIM(view_netport_v1.hwaddress),3,2), substring(TRIM(view_netport_v1.hwaddress),5,2), substring(TRIM(view_netport_v1.hwaddress),7,2), substring(TRIM(view_netport_v1.hwaddress),9,2), right(TRIM(view_netport_v1.hwaddress),2))
-                                        ELSE
-                                            view_netport_v1.hwaddress
-                                        END, ', ' order by view_netport_v1.hwaddress) as hwaddress from view_netport_v1 where (view_netport_v1.hwaddress is not null AND LENGTH(TRIM(view_netport_v1.hwaddress)) > 0) group by view_netport_v1.device_fk) network_hw on view_device_v1.device_pk=network_hw.device_fk
-                                    left join (select device_fk, sum(cost) as cost from view_purchaselineitem_v1 left join view_purchaselineitems_to_devices_v1 on purchaselineitem_fk = purchaselineitem_pk group by device_fk) t_cost on t_cost.device_fk=device_pk left join view_vendor_v1 on vendor_pk=vendor_fk
-                                LEFT OUTER JOIN (
-                                   SELECT p.device_fk,
-                                     SUM(p.pcount *
-                                         CASE
-                                           WHEN pm.hdsize_unit = 'GB' THEN pm.hdsize
-                                           WHEN pm.hdsize_unit = 'TB' THEN pm.hdsize * 1024
-                                           WHEN pm.hdsize_unit = 'PB' THEN pm.hdsize * 1024 * 1024
-                                           WHEN pm.hdsize_unit = 'EB' THEN pm.hdsize * 1024 * 1024 * 1024
-                                           WHEN pm.hdsize_unit = 'ZB' THEN pm.hdsize * 1024 * 1024 * 1024 * 1024
-                                           WHEN pm.hdsize_unit = 'YB' THEN pm.hdsize * 1024 * 1024 * 1024 * 1024 * 1024
-                                           ELSE NULL
-                                         END) AS total_part_disk_size
-                                     FROM view_part_v1 p
-                                     INNER JOIN view_partmodel_v1 pm ON p.partmodel_fk = pm.partmodel_pk
-                                     WHERE pm.type_id = 3 AND pm.hdsize IS NOT NULL AND p.pcount > 0 AND p.device_fk IS NOT NULL
-                                     GROUP BY p.device_fk
-                                 ) AS p ON view_device_v1.device_pk = p.device_fk
+                                    case
+                                        WHEN lower(view_device_v1.os_name) similar to '%(f5|netscaler)%' THEN 'Load Balancer'
+                                        WHEN view_device_v1.network_device THEN 'Switch'
+                                        WHEN lower(view_device_v1.type) = 'physical' AND lower(view_device_v1.os_name) similar to '%(windows|microsoft)%' AND lower(view_device_v1.os_name) like '%server%' THEN 'Windows Server'
+                                        WHEN lower(view_device_v1.type) = 'physical' AND lower(view_device_v1.os_name) similar to '%(unix|z/os|z os|zos|hp-ux|os400|os/400|os 400|linux|amazon|ubuntu|centos|redhat|debian|sles|suse|gentoo|oracle|freebsd|rhel|red hat|fedora|alma|rocky|arch)%' THEN 'Unix Server'
+                                        WHEN lower(view_device_v1.type) = 'physical' AND lower(view_device_v1.os_name) similar to '%(aix)%' THEN 'AIX Server'
+                                        WHEN lower(view_device_v1.type) = 'physical' AND lower(view_device_v1.os_name) similar to '%(solaris|sunos|sun os)%' THEN 'Solaris Server'
+                                        WHEN view_device_v1.virtual_host AND lower(view_device_v1.os_name) like '%esxi%' THEN 'VMware VCenter Host'
+                                        WHEN view_device_v1.virtual_host THEN 'Host'
+                                        WHEN lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'vmware' THEN 'VMware VCenter VM'
+                                        WHEN lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'amazon ec2 instance' THEN 'AWS VM'
+                                        WHEN lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'azure virtual machine' THEN 'Azure VM'
+                                        WHEN lower(view_device_v1.type) = 'physical' THEN 'Server'
+                                        WHEN lower(view_device_v1.type) = 'virtual' THEN 'Virtual Machine'
+                                        ELSE 'Computer'
+                                    END as asset_type,
+                                    view_device_v1.cpucount * view_device_v1.cpucore as total_cpucore,
+                                    t_cost.cost,
+                                    case WHEN view_device_v1.type = 'Virtual' THEN view_device_v1.type WHEN view_device_v1.type = 'Cluster' THEN view_device_v1.type ELSE coalesce(view_hardware_v1.name, view_device_v1.type) END as hw_model,
+                                    case WHEN view_device_v1.hz = 'MHz' and view_device_v1.cpupower is not null  THEN view_device_v1.cpupower / 1000 ELSE view_device_v1.cpupower END as cpuspeed,
+                                    case WHEN view_device_v1.ram_size_type = 'MB' and view_device_v1.ram is not null  THEN view_device_v1.ram / 1024 WHEN view_device_v1.ram_size_type = 'TB' and view_device_v1.ram is not null  THEN view_device_v1.ram * 1024 ELSE view_device_v1.ram END as ramsize,
+                                    network_ip.ip_address, network_ip.public_ip_address, network_ip.private_ip_address, network_ip.subnet_mask, network_hw.hwaddress,
+                                    CEIL(COALESCE(p.total_part_disk_size,
+                                                    CASE
+                                                        WHEN view_device_v1.hard_disk_count IS NOT NULL AND
+                                                             view_device_v1.hard_disk_size IS NOT NULL AND
+                                                             view_device_v1.hard_disk_size_type IS NOT NULL THEN
+                                                                view_device_v1.hard_disk_count *
+                                                                CASE
+                                                                    WHEN view_device_v1.hard_disk_size_type = 'GB' THEN view_device_v1.hard_disk_size
+                                                                    WHEN view_device_v1.hard_disk_size_type = 'TB' THEN view_device_v1.hard_disk_size * 1024
+                                                                    WHEN view_device_v1.hard_disk_size_type = 'PB' THEN view_device_v1.hard_disk_size * 1024 * 1024
+                                                                    ELSE NULL
+                                                                END
+                                                        ELSE NULL
+                                                    END)) AS disk_size,
+                                    warranty.warranty_months + (warranty.warranty_years * 12) as warranty_months,
+                                    warranty.end_date as warranty_end_date,
+                                    warranty.purchase_order_vendor as purchase_order_vendor,
+                                    assetlifecycle.date as acquisition_date,
+                                    asset_endlifecycle.date as end_of_life,
+                                    case when lower(view_device_v1.os_name) like '%windows%' or lower(view_device_v1.os_name) like '%microsoft%' then view_device_v1.os_version_no else view_device_v1.os_version end as device_os_version,
+                                    case when lower(view_device_v1.os_name) like '%windows%' or lower(view_device_v1.os_name) like '%microsoft%' then view_device_v1.os_version else view_device_v1.os_version_no end as device_os_version_no,
+                                    alias.hostname as hostname,
+                                    devicelastlogin.username as last_login_by,
+                                    case
+                                        WHEN (lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'amazon ec2 instance')
+                                            or lower(civ.name) similar to '%(aws|amazon)%' THEN 'AWS'
+                                        WHEN (lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'azure virtual machine')
+                                            or lower(civ.name) similar to '%(azure|microsoft)%' THEN 'AZURE'
+                                        WHEN (lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'vmware')
+                                            or lower(civ.name) like '%vmware%'
+                                            or (view_device_v1.virtual_host and lower(view_device_v1.os_name) like '%esxi%') then 'VMWARE VCENTER'
+                                        WHEN (lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'gce')
+                                            or lower(civ.name) similar to '%(google|gce|gcp)%' then 'GCP'
+                                        WHEN (lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'oracle cloud instance')
+                                            or lower(civ.name) like '%oracle%' then 'Oracle Cloud'
+                                        WHEN (lower(view_device_v1.type) = 'virtual' AND (lower(view_device_v1.virtual_subtype) = 'citrix/xen'
+                                                or lower(view_device_v1.virtual_subtype) = 'xen'))
+                                            or lower(civ.name) similar to '%(citrix|xen)%'
+                                            or (view_device_v1.virtual_host and lower(view_device_v1.os_name) like '%xenserver%') then 'Citrix'
+                                        WHEN (lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'hyper-v')
+                                            or (view_device_v1.virtual_host and lower(view_device_v1.os_name) similar to '%(windows|microsoft)%' AND lower(view_device_v1.os_name) like '%server%') then 'Hyper-V'
+                                        WHEN (lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'digitalocean instance')
+                                            or lower(civ.name) similar to '%(digitalocean|digital ocean)%' then 'Digital Ocean'
+                                        WHEN (lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'alibaba cloud instance')
+                                            or lower(civ.name) like '%alibaba%' then 'Alibaba Cloud'
+                                        else null
+                                    end as cloud_vendor,
+                                    ci.instance_name as cloud_instance_name,
+                                    ci.instance_type as cloud_instance_type,
+                                    ci.account as cloud_account,
+                                    ci.image_id as cloud_image_id,
+                                    ci.os_platform as cloud_os_platform,
+                                    subnet.network as subnet,
+                                    vrfgroup.vrfgroup as vrfgroup,
+                                    view_device_v1.cloud_location as cloud_region,
+                                    device_cluster.device_cluster_name as device_cluster_name,
+                                    mount_point.mountpoint as mountpoint,
+                                    CONCAT_WS(' ',  view_device_v1.os_name, view_device_v1.os_version, view_device_v1.os_version_no) as hypervisor,
+                                    hv.name as hardware_vendor,
+                                    virtual_host_device.datacenter as host_datacenter,
+                                    host_device_cluster.device_cluster_name as host_cluster_name,
+                                	case when view_device_v1.name ~* '^((?!-)[A-Za-z0-9-]{{1,63}}(?&lt;!-)\.)+[A-Za-z]{{2,6}}$' then substring(view_device_v1.name, position('.' in view_device_v1.name)+1)
+	                                else null end domain_name,
+	                                network_port_count.total_port_count as total_port_count
+                                FROM view_device_v1
+                                LEFT JOIN view_hardware_v1          on view_device_v1.hardware_fk   = view_hardware_v1.hardware_pk
+                                LEFT JOIN network_ip                on view_device_v1.device_pk     = network_ip.device_fk
+                                LEFT JOIN network_hw                on view_device_v1.device_pk     = network_hw.device_fk
+                                LEFT JOIN total_costs t_cost        on t_cost.device_fk             = device_pk
+                                LEFT OUTER JOIN part_count AS p     ON view_device_v1.device_pk     = p.device_fk
+                                LEFT OUTER JOIN warranty            ON view_device_v1.device_pk     = warranty.device_fk
+                                LEFT OUTER JOIN assetlifecycle      ON view_device_v1.device_pk     = assetlifecycle.device_fk
+                                LEFT OUTER JOIN asset_endlifecycle  ON view_device_v1.device_pk     = asset_endlifecycle.device_fk
+                                LEFT OUTER JOIN alias               ON view_device_v1.device_pk     = alias.device_fk
+                                LEFT OUTER JOIN devicelastlogin     ON view_device_v1.device_pk     = devicelastlogin.device_fk
+                                LEFT JOIN view_cloudinstance_v1 as ci     ON view_device_v1.device_pk     = ci.device_fk
+                                LEFT JOIN view_vendor_v1 as civ     ON view_device_v1.cloud_vendor_fk     = civ.vendor_pk
+                                LEFT JOIN device_cluster            ON view_device_v1.device_pk     = device_cluster.device_fk
+                                LEFT JOIN mount_point               ON view_device_v1.device_pk     = mount_point.device_fk
+                                LEFT JOIN view_vendor_v1 as hv     ON view_hardware_v1.vendor_fk     = hv.vendor_pk
+                                LEFT JOIN view_device_v1 as virtual_host_device     ON view_device_v1.virtual_host_device_fk     = virtual_host_device.device_pk
+                                LEFT JOIN device_cluster as host_device_cluster     ON virtual_host_device.device_pk     = host_device_cluster.device_fk
+                                LEFT JOIN subnet            ON view_device_v1.device_pk     = subnet.device_fk
+                                LEFT JOIN vrfgroup            ON view_device_v1.device_pk     = vrfgroup.device_fk
+                                LEFT JOIN network_port_count        ON view_device_v1.device_pk     = network_port_count.device_fk
                                 "
                         />
             </api>
 
-            <mapping callback="from_d42" key="name" source="Devices">
+            <mapping callback="from_d42" key="name" source="Devices" doql-suffix=" where view_device_v1.last_edited>'%s'">
+                <!--  General -->
+                <field resource="asset_no" source-type="string" target="asset_tag" target-type="string"
+                       target-header="General" not-null="true" min-length="1" max-length="255"/>
+                <field resource="name" source-type="string" target="name" target-type="string" target-header="General"
+                       set-space="true" min-length="1" max-length="248" escape="true"/>
+                <field resource="notes" source-type="string" target="description" target-header="General"
+                       not-null="true" set-space="true" min-length="1" max-length="60000"/>
+                <field resource="end_of_life" source-type="string" target="end_of_life" target-type="date"
+                       target-header="General"/>
+                <!--  ~General -->
+
+                <!--  Hardware -->
                 <field resource="in_service" source-type="boolean" target="asset_state" target-type="string"
                        target-header="Hardware">
                     <value-mapping default="Retired">
                         <item key="true" value="In Use"/>
                     </value-mapping>
                 </field>
-                <field resource="asset_no" source-type="string" target="asset_tag" target-type="string"
-                       target-header="General" not-null="true" min-length="1" max-length="255"/>
-                <field resource="name" source-type="string" target="name" target-type="string" target-header="General"
-                       set-space="true" min-length="1" max-length="248"/>
-                <field resource="type" source-type="string" target="asset_type_id" target-type="string"
-                       target-header="General"
-                       target-foregin="asset_types" target-foregin-key="name" target-field="asset_type_id">
-                    <value-mapping default="Server">
-                        <item key="Physical" value="Server"/>
-                        <item key="Virtual" value="Server"/>
-                        <item key="Blade" value="Server"/>
-                        <item key="Cluster" value="Server"/>
-                        <item key="Unknown" value="Server"/>
-                        <item key="Other" value="Server"/>
-                    </value-mapping>
-                </field>
-                <field resource="notes" source-type="string" target="description" target-header="General"
-                       not-null="true" set-space="true" min-length="1" max-length="60000"/>
+                <field resource="hw_model" source-type="string" target="product" target-type="string"
+                       target-header="Hardware"
+                       target-foregin="products" target-foregin-key="name" not-null="true" required="True" max-length="255"/>
+                <!-- Temporally don't map the vendor, because there is no way to sync the products and vendors using api right now.
+                <field resource="purchase_order_vendor" source-type="string" target="vendor" target-type="string"
+                       target-header="Hardware"
+                       target-foregin="vendors" target-foregin-key="name" not-null="true" required="True" max-length="255"/>
+                       -->
+                <field resource="serial_no" source-type="string" target="serial_number" target-type="string"
+                       target-header="Hardware" not-null="true" set-space="true"
+                       min-length="1" max-length="255" error-skip="true"/>
+                <field resource="warranty_months" source-type="integer" target="warranty" target-type="integer"
+                       target-header="Hardware" not-null="true"/>
+                <field resource="warranty_end_date" source-type="string" target="warranty_expiry_date" target-type="date"
+                       target-header="Hardware" not-null="true"/>
+                <field resource="acquisition_date" source-type="string" target="acquisition_date" target-type="date"
+                       target-header="Hardware" not-null="true"/>
+                <field resource="domain_name" source-type="string" target="domain" target-type="string"
+                       target-header="Hardware" not-null="true" required="True" max-length="255"
+                />
+                <!--  ~Hardware -->
+
+                <!--  Cost -->
+                <field resource="cost" type="float" target="cost"
+                       target-header="Cost" target-type="float" not-null="true" set-zero="true"/>
+                <!--  ~Cost -->
+
+                <!--  Computer -->
                 <field resource="uuid" type="string" target="uuid"
                        target-header="Computer" not-null="true" set-space="true"
                        min-length="1" max-length="255"/>
-                <field resource="cost" type="float" target="cost"
-                       target-header="Cost" target-type="float" not-null="true" set-zero="true"/>
                 <field resource="ip_address" type="string" target="computer_ip_address"
                        target-header="Computer" not-null="true" max-length="255"/>
                 <field resource="hwaddress" type="string" target="mac_address"
                        target-header="Computer" not-null="true" max-length="255"/>
                 <field resource="os_name" source-type="string" target="os" target-type="string"
                        target-header="Computer" not-null="true" set-space="true" min-length="1" max-length="255"/>
-                <field resource="os_version" source-type="string" target="os_version" target-type="string"
+                <field resource="device_os_version" source-type="string" target="os_version" target-type="string"
+                       target-header="Computer" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="device_os_version_no" source-type="string" target="os_service_pack" target-type="string"
+                       target-header="Computer" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="hostname" source-type="string" target="hostname" target-type="string"
+                       target-header="Computer" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="last_login_by" source-type="string" target="last_login_by" target-type="string"
                        target-header="Computer" not-null="true" set-space="true" min-length="1" max-length="255"/>
                 <field resource="cpuspeed" source-type="float" target="cpu_speed" target-type="float"
                        target-header="Computer" not-null="true"/>
                 <field resource="total_cpucore" source-type="integer" target="cpu_core_count" target-type="integer"
                        not-null="true"
                        target-header="Computer"/>
-                <field resource="hw_model" source-type="string" target="product" target-type="string"
-                       target-header="Hardware"
-                       target-foregin="products" target-foregin-key="name" not-null="true" required="True" max-length="255"/>
-                <field resource="serial_no" source-type="string" target="serial_number" target-type="string"
-                       target-header="Hardware" not-null="true" set-space="true"
-                       min-length="1" max-length="255" error-skip="true"/>
                 <field resource="ramsize" source-type="float" target="memory" target-type="float"
                        target-header="Computer" not-null="true" />
                 <field resource="disk_size" source-type="integer" target="disk_space" target-type="integer"
                        target-header="Computer" not-null="true" />
+                <!--  ~Computer -->
+
+                <!--  Cloud -->
+                <field resource="cost" type="float" target="cloud_cost"
+                       target-header="Cloud" target-type="float" not-null="true" set-zero="true"/>
+                <field resource="cloud_region" source-type="string" target="region" target-type="dropdown"
+                       target-header="Cloud" not-null="true" min-length="1" max-length="255"/>
+                <field resource="cloud_location" source-type="string" target="cd_availability_zone" target-type="dropdown"
+                       target-header="Cloud" not-null="true" min-length="1" max-length="255"/>
+                <field resource="cloud_vendor" source-type="string" target="provider_type" target-type="dropdown"
+                       target-header="Cloud" not-null="true"/>
+                <!--  ~Cloud -->
+
+                <!--  Host -->
+                <field resource="cloud_instance_id" source-type="string" target="item_id" target-type="string"
+                       target-header="Host" not-null="true" error-skip="true"/>
+                <field resource="cloud_instance_name" source-type="string" target="item_name" target-type="string"
+                       target-header="Host" not-null="true"/>
+                <field resource="ramsize" source-type="float" target="memory_size" target-type="float"
+                       target-header="Host" not-null="true" />
+                <field resource="total_cpucore" source-type="integer" target="cpu_core_count" target-type="integer"
+                       not-null="true"
+                       target-header="Host"/>
+                <field resource="disk_size" source-type="integer" target="total_disk_size" target-type="integer"
+                       target-header="Host" not-null="true" />
+                <field resource="cloud_status" source-type="string" target="state" target-type="string"
+                       target-header="Host">
+                    <value-mapping default="Unknown">
+                        <item key="Running" value="Powered On"/>
+                        <item key="Stopped" value="Powered Off"/>
+                    </value-mapping>
+                </field>
+                <field resource="ip_address" type="string" target="ip_address"
+                       target-header="Host" not-null="true" max-length="255"/>
+                <!--  ~Host -->
+
+                <!--  VMware VCenter Host -->
+                <field resource="datacenter" type="string" target="datacenter"
+                       target-header="VMware VCenter Host" not-null="true" max-length="255"/>
+                <field resource="device_cluster_name" type="string" target="cluster"
+                       target-header="VMware VCenter Host" not-null="true" max-length="255"/>
+                <field resource="mountpoint" type="string" target="datastore"
+                       target-header="VMware VCenter Host" not-null="true" max-length="255"/>
+                <field resource="hypervisor" type="string" target="hypervisor"
+                       target-header="VMware VCenter Host" not-null="true" max-length="255"/>
+                <field resource="cpuspeed" source-type="float" target="cpu_speed" target-type="float"
+                       target-header="VMware VCenter Host" not-null="true"/>
+                <field resource="os_name" source-type="string" target="os_type" target-type="string"
+                       target-header="VMware VCenter Host" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="uuid" type="string" target="instance_uuid"
+                       target-header="VMware VCenter Host" not-null="true" set-space="true"
+                       min-length="1" max-length="255"/>
+                <field resource="serial_no" source-type="string" target="cd_serial_number" target-type="string"
+                       target-header="VMware VCenter Host" not-null="true" set-space="true"
+                       min-length="1" max-length="255" error-skip="true"/>
+                <field resource="hardware_vendor" source-type="string" target="hardware_vendor" target-type="string"
+                       target-header="VMware VCenter Host" not-null="true" set-space="true"
+                       min-length="1" max-length="255" error-skip="true"/>
+                <!--  ~VMware VCenter Host -->
+
+                <!-- Virtual Machine -->
+                <field resource="cloud_instance_id" source-type="string" target="item_id" target-type="string"
+                       target-header="Virtual Machine" not-null="true" error-skip="true"/>
+                <field resource="cloud_instance_name" source-type="string" target="item_name" target-type="string"
+                       target-header="Virtual Machine" not-null="true"/>
+                <field resource="cloud_instance_type" source-type="string" target="cd_instance_type" target-type="dropdown"
+                       target-header="Virtual Machine" not-null="true" min-length="1" max-length="255"/>
+                <field resource="public_ip_address" type="string" target="public_address"
+                       target-header="Virtual Machine" not-null="true" max-length="255"/>
+                <field resource="private_ip_address" type="string" target="private_address"
+                       target-header="Virtual Machine" not-null="true" max-length="255"/>
+                <field resource="cloud_status" source-type="string" target="vm_state" target-type="string"
+                       target-header="Virtual Machine">
+                    <value-mapping default="Unknown">
+                        <item key="Running" value="Running"/>
+                        <item key="Stopped" value="Stopped"/>
+                    </value-mapping>
+                </field>
+                <field resource="os_name" source-type="string" target="os_name" target-type="string"
+                       target-header="Virtual Machine" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <!-- ~Virtual Machine -->
+
+                <!-- VMWare VCenter VM -->
+                <field resource="hostname" source-type="string" target="hostname" target-type="string"
+                       target-header="VMware VCenter VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="mountpoint" type="string" target="datastore"
+                       target-header="VMware VCenter VM" not-null="true" max-length="255"/>
+                <field resource="ramsize" source-type="float" target="memory_size" target-type="float"
+                       target-header="VMware VCenter VM" not-null="true" />
+                <field resource="total_cpucore" source-type="integer" target="num_of_cpu" target-type="integer"
+                       not-null="true"
+                       target-header="VMware VCenter VM"/>
+                <field resource="uuid" type="string" target="instance_uuid"
+                       target-header="VMware VCenter VM" not-null="true" set-space="true"
+                       min-length="1" max-length="255"/>
+                <field resource="host_datacenter" source-type="string" target="datacenter" target-type="string"
+                       target-header="VMware VCenter VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="host_cluster_name" source-type="string" target="cluster" target-type="string"
+                       target-header="VMware VCenter VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <!-- ~VMWare VCenter VM -->
+
+                <!-- AWS VM -->
+                <field resource="cloud_account" source-type="string" target="account_id" target-type="integer"
+                       target-header="AWS VM" not-null="true"/>
+                <field resource="cloud_instance_id" source-type="string" target="cd_instance_id" target-type="string"
+                       target-header="AWS VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="cloud_image_id" source-type="string" target="image_id" target-type="string"
+                       target-header="AWS VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="cloud_os_platform" source-type="string" target="platform" target-type="dropdown"
+                       target-header="AWS VM"/>
+                <field resource="subnet" source-type="string" target="subnet_id" target-type="string"
+                       target-header="AWS VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="vrfgroup" source-type="string" target="vpc_id" target-type="string"
+                       target-header="AWS VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <!-- ~AWS VM -->
+
+                <!-- Azure VM -->
+                <field resource="cloud_account" source-type="string" target="subscription_id" target-type="string"
+                       target-header="Azure VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="hostname" source-type="string" target="computer_name" target-type="string"
+                       target-header="Azure VM" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <!-- ~Azure VM -->
+
+                <!-- Printer -->
+                <field resource="ip_address" type="string" target="ip_address"
+                       target-header="Printer" not-null="true" max-length="255"/>
+                <field resource="hwaddress" type="string" target="mac_address"
+                       target-header="Printer" not-null="true" max-length="255"/>
+                <field resource="subnet_mask" type="string" target="subnet_mask"
+                       target-header="Printer" not-null="true" max-length="255"/>
+                <!-- ~Printer -->
+
+                <!-- Router -->
+                <field resource="os_name" source-type="string" target="firmware" target-type="string"
+                       target-header="Router" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="os_version" source-type="string" target="firmware_version" target-type="string"
+                       target-header="Router" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="ip_address" type="string" target="ip_address"
+                       target-header="Router" not-null="true" max-length="255"/>
+                <field resource="total_port_count" source-type="integer" target="ports" target-type="integer"
+                       target-header="Router" not-null="true"/>
+                <field resource="hwaddress" type="string" target="mac_address"
+                       target-header="Router" not-null="true" max-length="255"/>
+                <field resource="subnet_mask" type="string" target="subnet_mask"
+                       target-header="Router" not-null="true" max-length="255"/>
+                <!-- ~Router -->
+
+                <!-- Firewall -->
+                <field resource="os_name" source-type="string" target="firmware" target-type="string"
+                       target-header="Firewall" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="os_version" source-type="string" target="firmware_version" target-type="string"
+                       target-header="Firewall" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="ip_address" type="string" target="ip_address"
+                       target-header="Firewall" not-null="true" max-length="255"/>
+                <field resource="total_port_count" source-type="integer" target="ports" target-type="integer"
+                       target-header="Firewall" not-null="true"/>
+                <field resource="hwaddress" type="string" target="mac_address"
+                       target-header="Firewall" not-null="true" max-length="255"/>
+                <field resource="subnet_mask" type="string" target="subnet_mask"
+                       target-header="Firewall" not-null="true" max-length="255"/>
+                <!-- ~Firewall -->
+
+                <!--  Load Balancer -->
+                <field resource="cloud_instance_id" source-type="string" target="item_id" target-type="string"
+                       target-header="Load Balancer" not-null="true" error-skip="true"/>
+                <field resource="cloud_instance_name" source-type="string" target="item_name" target-type="string"
+                       target-header="Load Balancer" not-null="true"/>
+                <!--  ~Load Balancer -->
+
+                <!-- Switch -->
+                <field resource="os_name" source-type="string" target="firmware" target-type="string"
+                       target-header="Switch" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="os_version" source-type="string" target="firmware_version" target-type="string"
+                       target-header="Switch" not-null="true" set-space="true" min-length="1" max-length="255"/>
+                <field resource="ip_address" type="string" target="ip_address"
+                       target-header="Switch" not-null="true" max-length="255"/>
+                <field resource="total_port_count" source-type="integer" target="ports" target-type="integer"
+                       target-header="Switch" not-null="true"/>
+                <field resource="hwaddress" type="string" target="mac_address"
+                       target-header="Switch" not-null="true" max-length="255"/>
+                <field resource="subnet_mask" type="string" target="subnet_mask"
+                       target-header="Switch" not-null="true" max-length="255"/>
+                <!-- ~Switch -->
             </mapping>
+            <unmapping callback="from_d42" key="name" source="Devices" doql-suffix=" where view_device_v1.name='%s'">
+                <field resource="network_device" source-type="boolean" display-name="Network Device"/>
+                <field resource="blade_chassis" source-type="boolean" display-name="Blade Chassis"/>
+            </unmapping>
             <d42url resource="device_pk" source-type="integer" url="{0}/admin/rackraj/device/{1}/" />
         </task>
 
@@ -251,7 +1100,7 @@
             <mapping callback="from_d42" key="name" source="Devices"/>
         </task>
 
-        <task enable="true" type="software" description="Copy Softwares from Device42 to FreshService using DOQL">
+        <task enable="true" name="Software" type="software" description="Copy Softwares from Device42 to FreshService using DOQL">
             <api>
                 <target model="applications" target="freshservice" method="POST" update_method="PUT" path="api/v2/applications" asset-type="Application"/>
                 <resource model="Softwares" target="device42" method="POST"
@@ -259,15 +1108,15 @@
                           doql="select * from (select trim(name) as name, min(view_software_v1.software_type) as software_type, min(view_software_v1.notes) as notes, 'desktop' as application_type, min(view_software_v1.software_type) as category, min(last_changed) as last_changed from view_software_v1 group by trim(name)) a"
                         />
             </api>
-            <mapping callback="from_d42" key="name" source="Softwares">
-                <field resource="name" source-type="string" target="name" target-type="string" target-header="General" max-length="255"/>
+            <mapping callback="from_d42" key="name" source="Softwares" doql-suffix=" where last_changed>'%s'">
+                <field resource="name" source-type="string" target="name" target-type="string" target-header="General" max-length="255" escape="true"/>
                 <field resource="notes" source-type="string" target="notes" target-type="string" target-header="General" max-length="2000"/>
                 <field resource="software_type" source-type="string" target="status" target-type="string"
                        target-header="General">
                     <value-mapping default="null">
                         <item key="managed" value="managed"/>
                         <item key="ignored" value="ignored"/>
-                        <item key="prohibited" value="blacklisted"/>
+                        <item key="prohibited" value="restricted"/>
                         <item key="unmanaged" value="ignored"/>
                     </value-mapping>
                 </field>
@@ -276,23 +1125,93 @@
             </mapping>
         </task>
 
-        <task enable="true" type="software_in_use" description="Create Software Install from Software In Use">
+        <task enable="true" name="Software In Use" type="software_in_use" description="Create Software Install from Software In Use" d42_min_version="16.19.00">
             <api>
                 <target model="applications" target="freshservice" method="POST" path="api/v2/applications/{id}/installations"/>
                 <resource model="Devices" target="device42" method="POST"
                           path="services/data/v1.0/query/"
-                          doql="select view_device_v1.name as device_name, trim(view_software_v1.name) as software_name,  view_softwareinuse_v1.install_date, view_softwareinuse_v1.version from view_softwareinuse_v1  left join view_software_v1 on software_fk=software_pk left join view_device_v1 on device_fk=device_pk where view_softwareinuse_v1.device_fk is not null"
-                        />
+                          doql="
+							WITH device as
+							(
+								SELECT
+                                    case
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.physicalsubtype) = 'laptop' THEN 'Computer'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.physicalsubtype) = 'workstation' THEN 'Computer'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.physicalsubtype) = 'network printer' THEN 'Printer'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.physicalsubtype) = 'router' THEN 'Router'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.physicalsubtype) = 'firewall' THEN 'Firewall'
+                                        WHEN lower(view_device_v2.os_name) similar to '%(f5|netscaler)%' THEN 'Load Balancer'
+                                        WHEN view_device_v2.network_device THEN 'Switch'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.os_name) similar to '%(windows|microsoft)%' AND lower(view_device_v2.os_name) like '%server%' THEN 'Computer'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.os_name) similar to '%(unix|z/os|z os|zos|hp-ux|os400|os/400|os 400|linux|amazon|ubuntu|centos|redhat|debian|sles|suse|gentoo|oracle|freebsd|rhel|red hat|fedora|alma|rocky|arch)%' THEN 'Computer'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.os_name) similar to '%(aix)%' THEN 'Computer'
+                                        WHEN lower(view_device_v2.type) = 'physical' AND lower(view_device_v2.os_name) similar to '%(solaris|sunos|sun os)%' THEN 'Computer'
+                                        WHEN view_device_v2.virtual_host AND lower(view_device_v2.os_name) like '%esxi%' THEN 'VMware VCenter Host'
+                                        WHEN view_device_v2.virtual_host THEN 'Host'
+                                        WHEN lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'vmware' THEN 'Virtual Machine'
+                                        WHEN lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'amazon ec2 instance' THEN 'Virtual Machine'
+                                        WHEN lower(view_device_v2.type) = 'virtual' AND lower(view_device_v2.virtualsubtype) = 'azure virtual machine' THEN 'Virtual Machine'
+                                        WHEN lower(view_device_v2.type) = 'physical' THEN 'Computer'
+                                        WHEN lower(view_device_v2.type) = 'virtual' THEN 'Virtual Machine'
+                                        ELSE 'Computer'
+                                    END as asset_type,
+									view_device_v2.device_pk,
+									view_device_v2.name,
+									view_device_v2.last_edited
+								FROM view_device_v2
+							)
+							select device.name as device_name, trim(view_software_v1.name) as software_name,  view_softwareinuse_v1.install_date, view_softwareinuse_v1.version from view_softwareinuse_v1
+							left join view_software_v1 on software_fk=software_pk inner join device on device_fk=device_pk
+							where (device.asset_type = 'Computer' or device.asset_type = 'Virtual Machine')
+						"/>
             </api>
-            <mapping callback="from_d42" key="dependent_device_name" device-name="device_name" software-name="software_name" install-date="install_date" version="version">
+            <mapping callback="from_d42" doql-suffix=" and GREATEST(view_softwareinuse_v1.last_updated, device.last_edited, view_software_v1.last_changed)>'%s'" key="dependent_device_name" device-name="device_name" software-name="software_name" install-date="install_date" version="version">
             </mapping>
         </task>
 
-        <task enable="true" type="affinity_group" description="Create Relationship from Affinity Groups">
+        <task enable="false" name="Software In Use" type="software_in_use" description="Create Software Install from Software In Use" d42_max_version="16.18.02">
             <api>
-                <target model="assets" target="freshservice" method="POST" path="cmdb/items/{id}/associate.json"/>
+                <target model="applications" target="freshservice" method="POST" path="api/v2/applications/{id}/installations"/>
                 <resource model="Devices" target="device42" method="POST"
                           path="services/data/v1.0/query/"
+                          doql="
+							WITH device as
+							(
+								SELECT
+                                    case
+                                        WHEN lower(view_device_v1.os_name) similar to '%(f5|netscaler)%' THEN 'Load Balancer'
+                                        WHEN view_device_v1.network_device THEN 'Switch'
+                                        WHEN lower(view_device_v1.type) = 'physical' AND lower(view_device_v1.os_name) similar to '%(windows|microsoft)%' AND lower(view_device_v1.os_name) like '%server%' THEN 'Computer'
+                                        WHEN lower(view_device_v1.type) = 'physical' AND lower(view_device_v1.os_name) similar to '%(unix|z/os|z os|zos|hp-ux|os400|os/400|os 400|linux|amazon|ubuntu|centos|redhat|debian|sles|suse|gentoo|oracle|freebsd|rhel|red hat|fedora|alma|rocky|arch)%' THEN 'Computer'
+                                        WHEN lower(view_device_v1.type) = 'physical' AND lower(view_device_v1.os_name) similar to '%(aix)%' THEN 'Computer'
+                                        WHEN lower(view_device_v1.type) = 'physical' AND lower(view_device_v1.os_name) similar to '%(solaris|sunos|sun os)%' THEN 'Computer'
+                                        WHEN view_device_v1.virtual_host AND lower(view_device_v1.os_name) like '%esxi%' THEN 'VMware VCenter Host'
+                                        WHEN view_device_v1.virtual_host THEN 'Host'
+                                        WHEN lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'vmware' THEN 'Virtual Machine'
+                                        WHEN lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'amazon ec2 instance' THEN 'Virtual Machine'
+                                        WHEN lower(view_device_v1.type) = 'virtual' AND lower(view_device_v1.virtual_subtype) = 'azure virtual machine' THEN 'Virtual Machine'
+                                        WHEN lower(view_device_v1.type) = 'physical' THEN 'Computer'
+                                        WHEN lower(view_device_v1.type) = 'virtual' THEN 'Virtual Machine'
+                                        ELSE 'Computer'
+                                    END as asset_type,
+									view_device_v1.device_pk,
+									view_device_v1.name,
+									view_device_v1.last_edited
+								FROM view_device_v1
+							)
+							select device.name as device_name, trim(view_software_v1.name) as software_name,  view_softwareinuse_v1.install_date, view_softwareinuse_v1.version from view_softwareinuse_v1
+							left join view_software_v1 on software_fk=software_pk inner join device on device_fk=device_pk
+							where (device.asset_type = 'Computer' or device.asset_type = 'Virtual Machine')
+						"/>
+            </api>
+            <mapping callback="from_d42" doql-suffix=" and GREATEST(view_softwareinuse_v1.last_updated, device.last_edited, view_software_v1.last_changed)>'%s'" key="dependent_device_name" device-name="device_name" software-name="software_name" install-date="install_date" version="version">
+            </mapping>
+        </task>
+
+        <task enable="true" name="Affinity Group Device To Device Relationships" type="affinity_group" description="Create Relationship from Affinity Groups">
+            <api>
+                <target model="assets" target="freshservice" method="POST"/>
+                <resource model="Devices" target="device42" method="POST"
                           doql="
                                 select df1.dependent_device_fk, df1.dependent_device_name, df1.dependency_device_fk, df1.dependency_device_name
                                 from view_deviceaffinity_v2 df1
@@ -308,10 +1227,9 @@
 
         <task enable="false" type="affinity_group" description="Delete Relationship from Affinity Groups">
             <api>
-                <target model="assets" target="freshservice" method="POST" path="cmdb/items/{id}/associate.json"
+                <target model="assets" target="freshservice" method="POST"
                         delete="true"/>
                 <resource model="Devices" target="device42" method="POST"
-                          path="services/data/v1.0/query/"
                           doql="select distinct df1.dependent_device_fk, df1.dependent_device_name, df1.dependency_device_fk, df1.dependency_device_name from view_deviceaffinity_v2 df1 left outer join view_deviceaffinity_v2 df2 on df2.dependent_device_fk = df1.dependent_device_fk and df1.dependency_device_fk = df2.dependency_device_fk and df2.effective_to is null where df1.effective_to is not null and df1.dependent_device_fk is not null and df2.deviceaffinity_pk is null"
                         />
             </api>
@@ -319,11 +1237,10 @@
             </mapping>
         </task>
 
-        <task enable="true" type="business_app" description="Create Relationship from Business Apps">
+        <task enable="true" name="Business Application Device To Device Relationships" type="business_app" description="Create Relationship from Business Apps">
             <api>
-                <target model="assets" target="freshservice" method="POST" path="cmdb/items/{id}/associate.json"/>
+                <target model="assets" target="freshservice" method="POST"/>
                 <resource model="Devices" target="device42" method="POST"
-                          path="services/data/v1.0/query/"
                           doql="
                                 select case connection_type when 'reversed' then be2.device_fk else be1.device_fk end as dependent_device_fk,
                                        case connection_type when 'reversed' then d2.name else d1.name end as dependent_device_name,
@@ -343,9 +1260,8 @@
 
         <task enable="false" type="business_app" description="Delete Relationship from Business Apps">
             <api>
-                <target model="assets" target="freshservice" method="POST" path="cmdb/items/{id}/associate.json" delete="true"/>
+                <target model="assets" target="freshservice" method="POST" delete="true"/>
                 <resource model="Devices" target="device42" method="POST"
-                          path="services/data/v1.0/query/"
                           doql="
                                 select case connection_type when 'reversed' then be2.device_fk else be1.device_fk end as dependent_device_fk,
                                        case connection_type when 'reversed' then d2.name else d1.name end as dependent_device_name,
@@ -362,5 +1278,243 @@
             <mapping callback="from_d42" key="dependent_device_name" downstream-relationship="Sends Data To" upstream-relationship="Receives Data From" target-key="dependency_device_name">
             </mapping>
         </task>
+
+        <task enable="true" name="Business Applications" description="Copy Business Application from Device42 to FreshService" d42_min_version="16.19.00">
+            <api>
+                <target model="assets" target="freshservice" method="POST" update_method="PUT" path="api/v2/assets"/>
+                <resource model="Businessapps" target="device42" method="POST"
+                          doql="
+                                select ba.businessapplication_pk, ba.name, ba.description, ba.criticality,
+                                    cus.name as customer_name, eu.email as owner_email,
+                                    'Business Service' as asset_type
+                                from view_businessapplication_v1 ba
+                                left join view_customer_v1 cus on ba.customer_fk = cus.customer_pk
+                                left join view_enduser_v1 eu on ba.business_app_owner_enduser_fk = eu.enduser_pk
+                               "
+                        />
+            </api>
+
+            <mapping callback="from_d42" key="name" source="Businessapps" doql-suffix=" where GREATEST(ba.last_changed, eu.last_updated) >'%s'">
+                <field resource="name" source-type="string" target="name" target-type="string" target-header="General"
+                       set-space="true" min-length="1" max-length="248" escape="true"/>
+                <field resource="description" source-type="string" target="description" target-header="General"
+                       not-null="true" set-space="true" min-length="1" max-length="60000"/>
+                <field resource="criticality" source-type="string" target="impact" target-type="string"
+                       target-header="General">
+                    <value-mapping default="low">
+                        <item key="Business Core" value="low"/>
+                        <item key="Business Essential" value="medium"/>
+                        <item key="Business Supporting" value="medium"/>
+                        <item key="Mission Critical" value="high"/>
+                    </value-mapping>
+                </field>
+                <field resource="customer_name" source-type="string" target="group_id" target-type="string"
+                       not-null="true" required="True"
+                       target-header="Assignment"
+                       target-foregin="groups" target-foregin-key="name" target-field="group_id"/>
+                <field resource="owner_email" source-type="string" target="user_id" target-type="string"
+                       target-header="Assignment"
+                       target-foregin="agents" target-foregin-key="email" target-field="user_id"/>
+            </mapping>
+            <unmapping callback="from_d42" key="name" doql-suffix=" where ba.name='%s'">
+            </unmapping>
+            <d42url resource="businessapplication_pk" source-type="integer" url="{0}/admin/rackraj/businessapp/{1}/" />
+        </task>
+
+        <task enable="false" name="Business Applications" description="Copy Business Application from Device42 to FreshService" d42_max_version="16.18.02">
+            <api>
+                <target model="assets" target="freshservice" method="POST" update_method="PUT" path="api/v2/assets"/>
+                <resource model="Businessapps" target="device42" method="POST"
+                          doql="
+                                select ba.businessapplication_pk, ba.name,
+                                    'Business Service' as asset_type
+                                from view_businessapplication_v1 ba
+                               "
+                        />
+            </api>
+
+            <mapping callback="from_d42" key="name" source="Businessapps" doql-suffix=" where ba.last_changed >'%s'">
+                <field resource="name" source-type="string" target="name" target-type="string" target-header="General"
+                       set-space="true" min-length="1" max-length="248" escape="true"/>
+            </mapping>
+            <unmapping callback="from_d42" key="name" doql-suffix=" where ba.name='%s'">
+            </unmapping>
+            <d42url resource="businessapplication_pk" source-type="integer" url="{0}/admin/rackraj/businessapp/{1}/" />
+        </task>
+
+        <task enable="true" name="Business Application To Device Relationships" type="business_app" description="Create Relationship from Devices to Business Apps">
+            <api>
+                <target model="assets" target="freshservice" method="POST"/>
+                <resource model="Devices" target="device42" method="POST"
+                          doql="
+                                select ba.name as business_app_name, device.name as device_name
+                                from view_businessapplication_v1 ba
+                                join view_businessapplicationelement_v1 bae on ba.businessapplication_pk = bae.businessapplication_fk
+                                join view_device_v1 device on bae.device_fk = device.device_pk
+                               "
+                        />
+            </api>
+            <mapping callback="from_d42" key="business_app_name" downstream-relationship="Hosted On" upstream-relationship="Hosts" target-key="device_name">
+            </mapping>
+        </task>
+
+        <task enable="true" name="Contracts" type="contracts" description="Copy contract info from Device42 to FreshService">
+            <api>
+                <target model="contracts" target="freshservice" method="POST" update_method="PUT" path="api/v2/contracts" asset-type="Contracts"/>
+                <resource target="device42" method="POST"
+                          path="services/data/v1.0/query/"
+                          doql="
+                            select plid.device_name, v.name vendor_name,
+                                v.name || '-' || p.order_no || '-' || pli.line_no as name,
+                                case
+                                    WHEN lower(pli.contract_type_name) = 'warranty' THEN 'Warranty'
+                                    WHEN lower(pli.contract_type_name) in ('base', 'upgrade') and lower(v.name) in ('ibm', 'lenovo') THEN 'Warranty'
+                                    WHEN lower(pli.contract_type_name) = 'lease' THEN 'Lease'
+                                    ELSE 'Maintenance'
+                                end as contract_type_name,
+                                pli.contract_id, pli.cost, pli.start_date, pli.end_date
+                            from view_purchaselineitems_to_devices_v1 plid
+                            inner join view_purchaselineitem_v1 pli on plid.purchaselineitem_fk = pli.purchaselineitem_pk
+                            inner join view_purchase_v1 p on pli.purchase_fk = p.purchase_pk
+                            inner join view_vendor_v1 v on p.vendor_fk = v.vendor_pk
+                            where lower(pli.line_type) = 'contract' and pli.start_date is not null and pli.end_date is not null
+                            "
+                        />
+            </api>
+            <mapping callback="from_d42" key="name">
+                <field resource="name" source-type="string" target="name" target-type="string" max-length="255" escape="true"/>
+                <field resource="name" source-type="string" target="contract_number" target-type="string" max-length="255" escape="true"/>
+                <field resource="vendor_name" source-type="string" target="vendor_id" target-type="string"
+                       target-foregin="vendors" target-foregin-key="name" max-length="255" not-null="true" />
+                <field resource="contract_type_name" source-type="string" target="contract_type_id" target-type="string"
+                       target-foregin="contract_types" target-foregin-key="name">
+                    <value-mapping default="Maintenance">
+                        <item key="Lease" value="Lease"/>
+                        <item key="Warranty" value="Warranty"/>
+                        <item key="Maintenance" value="Maintenance"/>
+                    </value-mapping>
+                </field>
+                <field resource="cost" source-type="float" target="cost" not-null="true" target-type="float" not-zero="true" />
+                <field resource="start_date" source-type="string" target="start_date" />
+                <field resource="end_date" source-type="string" target="end_date" />
+            </mapping>
+        </task>
+
+        <task enable="true" name="Device Contract Associations" type="contract_in_asset" description="Create association between asset and contract">
+            <api>
+                <target model="contracts" target="freshservice" method="POST" path="api/v2/contracts/{id}/associated-assets"/>
+                <resource model="contracts" target="device42" method="POST"
+                          path="services/data/v1.0/query/"
+                          doql="
+                            select plid.device_name,
+                                v.name || '-' || p.order_no || '-' || pli.line_no as contract_name
+                            from view_purchaselineitems_to_devices_v1 plid
+                            inner join view_purchaselineitem_v1 pli on plid.purchaselineitem_fk = pli.purchaselineitem_pk
+                            inner join view_purchase_v1 p on pli.purchase_fk = p.purchase_pk
+                            inner join view_vendor_v1 v on p.vendor_fk = v.vendor_pk
+                            where lower(pli.line_type) = 'contract' and
+                                pli.start_date is not null and pli.end_date is not null
+                            "
+                        />
+            </api>
+            <mapping callback="from_d42" device-name="device_name" contract-name="contract_name">
+            </mapping>
+        </task>
+
+        <task enable="true" name="Software Licensing" type="contracts" description="Copy Software Licensing info from Device42 to FreshService">
+            <api>
+                <target model="contracts" target="freshservice" method="POST" update_method="PUT" path="api/v2/contracts" asset-type="Contracts"/>
+                <resource target="device42" method="POST"
+                          path="services/data/v1.0/query/"
+                          doql="
+                            select 	case when p.order_no is null then s.name else s.name || '-' || p.order_no || '-' || pli.line_no end as name,
+                                    'Software License' as contract_type_name,
+                                    case when v.name is not null then v.name else sv.name end vendor_name,
+                                    pli.cost unit_cost, pli.start_date, pli.end_date,
+                                    s.name software_name,
+                                    case when pli.quantity is not null then pli.quantity else s.licensed_count end licensed_count,
+                                    case when pli.quantity is not null then pli.quantity else s.licensed_count end * pli.cost as cost,
+                                    pli.contract_id,
+                                    case when slm.is_free = true then 'Free' else 'Volume' end license_type,
+                                    pli.frequency,
+                                    'per_unit' as pricing_model,
+                                    case when pli.notes is not null and pli.notes &lt;&gt; '' then pli.notes else s.notes end as notes
+                            from view_software_v1 s
+                            left outer join view_softwarelicensemodel_v1 slm on s.softwarelicensemodel_fk = slm.softwarelicensemodel_pk
+                            left outer join view_purchaselineitems_to_softwares_v1 plis on s.software_pk = plis.software_fk
+                            left outer join view_purchaselineitem_v1 pli on plis.purchaselineitem_fk = pli.purchaselineitem_pk
+                            left outer join view_purchase_v1 p on pli.purchase_fk = p.purchase_pk
+                            left outer join view_vendor_v1 v on p.vendor_fk = v.vendor_pk
+                            left outer join view_vendor_v1 sv on s.vendor_fk = sv.vendor_pk
+                            WHERE
+                                lower(s.software_type) = 'managed' and
+                                (pli.purchaselineitem_pk is not null or s.licensed_count is not null) and
+                                (v.name is not null or sv.name is not null)
+                            "
+                        />
+            </api>
+            <mapping callback="from_d42" key="name">
+                <field resource="name" source-type="string" target="name" target-type="string" max-length="255" escape="true"/>
+                <field resource="name" source-type="string" target="contract_number" target-type="string" max-length="255" escape="true"/>
+                <field resource="vendor_name" source-type="string" target="vendor_id" target-type="string"
+                       target-foregin="vendors" target-foregin-key="name" max-length="255" not-null="true" />
+                <field resource="contract_type_name" source-type="string" target="contract_type_id" target-type="string"
+                       target-foregin="contract_types" target-foregin-key="name" />
+                <field resource="software_name" source-type="string" target="software_id" target-type="string"
+                       target-foregin="applications" target-foregin-key="name" escape="true"/>
+                <field resource="cost" source-type="float" target="cost" not-null="true" target-type="float" not-zero="true"/>
+                <field resource="start_date" source-type="string" target="start_date" />
+                <field resource="end_date" source-type="string" target="end_date" />
+                <field resource="frequency" source-type="string" target="billing_cycle" target-type="string">
+                    <value-mapping default="one_time">
+                        <item key="one time" value="one_time"/>
+                        <item key="monthly" value="monthly"/>
+                        <item key="quarterly" value="quarterly"/>
+                        <item key="bi-annually" value="six_month"/>
+                        <item key="annually" value="annual"/>
+                        <item key="2years" value="annual"/>
+                        <item key="3years" value="annual"/>
+                        <item key="4years" value="annual"/>
+                        <item key="5years" value="annual"/>
+                    </value-mapping>
+                </field>
+                <field resource="unit_cost" source-type="float"
+                       target="item_cost_details" not-null="true" target-type="float"
+                       target-sub-key="cost"
+                       not-zero="true"/>
+                <field resource="pricing_model" source-type="string"
+                       target="item_cost_details" target-sub-key="pricing_model"/>
+                <field resource="licensed_count" source-type="integer"
+                       target="item_cost_details" target-type="integer"
+                       target-sub-key="count"
+                       not-null="true"/>
+                <field resource="notes" source-type="string" target="item_cost_details"
+                       target-sub-key="comments"
+                       not-null="true" set-space="true" min-length="1" max-length="60000"/>
+            </mapping>
+        </task>
+
+        <task enable="true" name="Create relationship between Host and Virtual Machine" type="business_app" description="Create relationship between Host and Virtual Machine">
+            <api>
+                <target model="assets" target="freshservice" method="POST"/>
+                <resource model="Devices" target="device42" method="POST"
+                          doql="
+								WITH
+                                    host_device AS (
+                                        select device_pk, name from view_device_v1 where view_device_v1.virtual_host )
+
+                                    ,vm_device as ( select device_pk, name, virtual_host_device_fk from view_device_v1 where lower(view_device_v1.type) = 'virtual')
+
+                                select
+                                    host_device.device_pk as dependent_device_fk,
+                                    host_device.name as dependent_device_name,
+                                    vm_device.device_pk as dependency_device_fk,
+                                    vm_device.name as dependency_device_name
+                                from host_device inner join vm_device on host_device.device_pk = vm_device.virtual_host_device_fk"
+                        />
+            </api>
+            <mapping callback="from_d42" key="dependent_device_name" downstream-relationship="Virtualized by" upstream-relationship="Virtualizes" target-key="dependency_device_name">
+            </mapping>
+        </task>
     </tasks>
 </meta>
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 6085abd..02dc600 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,3 +3,5 @@ pyparsing==2.1.10
 pyzmq==16.0.2
 requests==2.13.0
 xmljson==0.2.0
+atlassian-jwt==1.9.0
+pytz==2017.3

From 6eca078864cd2318f3a7adf1ae78b4220e57947b Mon Sep 17 00:00:00 2001
From: Roman Nyschuk <roman.nyschuk@device42.com>
Date: Tue, 4 Jul 2023 22:51:09 +0300
Subject: [PATCH 2/4] D42-29347 Bring up to date with the changes the app has

---
 d42_sd_sync.py     |  8 ++++++--
 mapping.xml.sample | 26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/d42_sd_sync.py b/d42_sd_sync.py
index ff0f855..30a7722 100755
--- a/d42_sd_sync.py
+++ b/d42_sd_sync.py
@@ -37,7 +37,7 @@
 parser.add_argument('-c', '--config', help='Config file', default='mapping.xml')
 parser.add_argument('-l', '--logfolder', help='log folder path', default='.')
 
-freshservice = FreshService()
+freshservice = None
 default_approver = None
 fs_cache = dict()
 
@@ -1059,7 +1059,11 @@ def task_execute(task, device42):
     else:
         doql = None
 
-    source_url = _resource['@path']
+    if '@path' in _resource:
+        source_url = _resource['@path']
+    else:
+        source_url = "services/data/v1.0/query/"
+
     if "@extra-filter" in _resource:
         source_url += _resource["@extra-filter"] + "&amp;"
 
diff --git a/mapping.xml.sample b/mapping.xml.sample
index 4dfbb93..cbc1b77 100644
--- a/mapping.xml.sample
+++ b/mapping.xml.sample
@@ -25,7 +25,7 @@
                             "
                         />
             </api>
-            <mapping callback="from_d42" key="name" doql-suffix=" where GREATEST(view_hardware_v2.last_changed, view_vendor_v1.last_changed, view_device_v2.last_changed) >'%s'">
+            <mapping callback="from_d42" key="name">
                 <field resource="name" source-type="string" target="name" target-type="string" max-length="255" escape="true"/>
                 <field resource="manufacturer" source-type="string" target="manufacturer" target-type="string"
                    not-null="true" set-space="true" min-length="1" max-length="255"/>
@@ -46,7 +46,7 @@
                             "
                         />
             </api>
-            <mapping callback="from_d42" key="name" doql-suffix=" where GREATEST(view_hardware_v1.last_changed, view_vendor_v1.last_changed, view_device_v1.last_changed) >'%s'">
+            <mapping callback="from_d42" key="name">
                 <field resource="name" source-type="string" target="name" target-type="string" max-length="255" escape="true"/>
                 <field resource="manufacturer" source-type="string" target="manufacturer" target-type="string"
                    not-null="true" set-space="true" min-length="1" max-length="255"/>
@@ -314,7 +314,7 @@
                         />
             </api>
 
-            <mapping callback="from_d42" key="name" source="Devices" doql-suffix=" where view_device_v2.last_edited>'%s' ">
+            <mapping callback="from_d42" key="name" source="Devices">
                 <!--  General -->
                 <field resource="asset_no" source-type="string" target="asset_tag" target-type="string"
                        target-header="General" not-null="true" min-length="1" max-length="255"/>
@@ -575,7 +575,7 @@
                        target-header="Switch" not-null="true" max-length="255"/>
                 <!-- ~Switch -->
             </mapping>
-            <unmapping callback="from_d42" key="name" source="Devices" doql-suffix=" where view_device_v2.name='%s'">
+            <unmapping callback="from_d42" key="name" source="Devices">
                 <field resource="network_device" source-type="boolean" display-name="Network Device"/>
                 <field resource="blade_chassis" source-type="boolean" display-name="Blade Chassis"/>
                 <field resource="device_subtype" source-type="string" display-name="Device Subtype"/>
@@ -826,7 +826,7 @@
                         />
             </api>
 
-            <mapping callback="from_d42" key="name" source="Devices" doql-suffix=" where view_device_v1.last_edited>'%s'">
+            <mapping callback="from_d42" key="name" source="Devices">
                 <!--  General -->
                 <field resource="asset_no" source-type="string" target="asset_tag" target-type="string"
                        target-header="General" not-null="true" min-length="1" max-length="255"/>
@@ -1083,7 +1083,7 @@
                        target-header="Switch" not-null="true" max-length="255"/>
                 <!-- ~Switch -->
             </mapping>
-            <unmapping callback="from_d42" key="name" source="Devices" doql-suffix=" where view_device_v1.name='%s'">
+            <unmapping callback="from_d42" key="name" source="Devices">
                 <field resource="network_device" source-type="boolean" display-name="Network Device"/>
                 <field resource="blade_chassis" source-type="boolean" display-name="Blade Chassis"/>
             </unmapping>
@@ -1108,7 +1108,7 @@
                           doql="select * from (select trim(name) as name, min(view_software_v1.software_type) as software_type, min(view_software_v1.notes) as notes, 'desktop' as application_type, min(view_software_v1.software_type) as category, min(last_changed) as last_changed from view_software_v1 group by trim(name)) a"
                         />
             </api>
-            <mapping callback="from_d42" key="name" source="Softwares" doql-suffix=" where last_changed>'%s'">
+            <mapping callback="from_d42" key="name" source="Softwares">
                 <field resource="name" source-type="string" target="name" target-type="string" target-header="General" max-length="255" escape="true"/>
                 <field resource="notes" source-type="string" target="notes" target-type="string" target-header="General" max-length="2000"/>
                 <field resource="software_type" source-type="string" target="status" target-type="string"
@@ -1165,7 +1165,7 @@
 							where (device.asset_type = 'Computer' or device.asset_type = 'Virtual Machine')
 						"/>
             </api>
-            <mapping callback="from_d42" doql-suffix=" and GREATEST(view_softwareinuse_v1.last_updated, device.last_edited, view_software_v1.last_changed)>'%s'" key="dependent_device_name" device-name="device_name" software-name="software_name" install-date="install_date" version="version">
+            <mapping callback="from_d42" key="dependent_device_name" device-name="device_name" software-name="software_name" install-date="install_date" version="version">
             </mapping>
         </task>
 
@@ -1204,7 +1204,7 @@
 							where (device.asset_type = 'Computer' or device.asset_type = 'Virtual Machine')
 						"/>
             </api>
-            <mapping callback="from_d42" doql-suffix=" and GREATEST(view_softwareinuse_v1.last_updated, device.last_edited, view_software_v1.last_changed)>'%s'" key="dependent_device_name" device-name="device_name" software-name="software_name" install-date="install_date" version="version">
+            <mapping callback="from_d42" key="dependent_device_name" device-name="device_name" software-name="software_name" install-date="install_date" version="version">
             </mapping>
         </task>
 
@@ -1294,7 +1294,7 @@
                         />
             </api>
 
-            <mapping callback="from_d42" key="name" source="Businessapps" doql-suffix=" where GREATEST(ba.last_changed, eu.last_updated) >'%s'">
+            <mapping callback="from_d42" key="name" source="Businessapps">
                 <field resource="name" source-type="string" target="name" target-type="string" target-header="General"
                        set-space="true" min-length="1" max-length="248" escape="true"/>
                 <field resource="description" source-type="string" target="description" target-header="General"
@@ -1316,7 +1316,7 @@
                        target-header="Assignment"
                        target-foregin="agents" target-foregin-key="email" target-field="user_id"/>
             </mapping>
-            <unmapping callback="from_d42" key="name" doql-suffix=" where ba.name='%s'">
+            <unmapping callback="from_d42" key="name">
             </unmapping>
             <d42url resource="businessapplication_pk" source-type="integer" url="{0}/admin/rackraj/businessapp/{1}/" />
         </task>
@@ -1333,11 +1333,11 @@
                         />
             </api>
 
-            <mapping callback="from_d42" key="name" source="Businessapps" doql-suffix=" where ba.last_changed >'%s'">
+            <mapping callback="from_d42" key="name" source="Businessapps">
                 <field resource="name" source-type="string" target="name" target-type="string" target-header="General"
                        set-space="true" min-length="1" max-length="248" escape="true"/>
             </mapping>
-            <unmapping callback="from_d42" key="name" doql-suffix=" where ba.name='%s'">
+            <unmapping callback="from_d42" key="name">
             </unmapping>
             <d42url resource="businessapplication_pk" source-type="integer" url="{0}/admin/rackraj/businessapp/{1}/" />
         </task>

From df6d9bed899f93be7deee2cab0ec16a7230fa8b4 Mon Sep 17 00:00:00 2001
From: Roman Nyschuk <roman.nyschuk@device42.com>
Date: Mon, 10 Jul 2023 20:37:49 +0300
Subject: [PATCH 3/4] Update several comments

---
 README.md      | 22 +++++++++++-----------
 d42_sd_sync.py | 42 +++++++++++++++++++++---------------------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index 9b2441f..487b3aa 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [Device42](http://www.device42.com/) is a Continuous Discovery software for your IT Infrastructure. It helps you automatically maintain an up-to-date inventory of your physical, virtual, and cloud servers and containers, network components, software/services/applications, and their inter-relationships and inter-dependencies.
 
 
-This repository contains script that helps you sync data from Device42 to FreshService.
+This repository contains script that helps you sync data from Device42 to Freshservice.
 
 ### Download and Installation
 -----------------------------
@@ -35,35 +35,35 @@ These can all be installed by running pip install -r requirements.txt.
 In order to run the legacy migration, you will also need to modify the mapping.xml file so that the legacy mapping options are used
 
 modify the following line so that `enable` is set to false for the v2_views
-```enable="false" description="Copy Servers from Device42 to FreshService using DOQL v2_views"```
+```enable="false" description="Copy Servers from Device42 to Freshservice using DOQL v2_views"```
 
 modify the following line so that `enable` is set to true for the v1_views
-```enable="true" description="Copy Servers from Device42 to FreshService using DOQL v1_views"```
+```enable="true" description="Copy Servers from Device42 to Freshservice using DOQL v1_views"```
 
 Once the packages are installed and the script is configured, the script can be run by this command: python d42_sd_sync.py.
 
 ### Configuration
 -----------------------------
-Prior to using the script, it must be configured to connect to your Device42 instance and your FreshService instance.
+Prior to using the script, it must be configured to connect to your Device42 instance and your Freshservice instance.
 * Save a copy of mapping.xml.sample as mapping.xml. 
-* Enter your URL, User, Password, API Key in the FreshService and Device42 sections (lines 2-10).
-API Key can be obtained from FreshService profile page
+* Enter your URL, User, Password, API Key, and default approver email address in the Freshservice and Device42 sections (lines 2-11).
+API Key can be obtained from Freshservice profile page
 
 Below the credential settings, you’ll see a Tasks section. 
-Multiple Tasks can be setup to synchronize various CIs from Device42 to FreshService.
+Multiple Tasks can be setup to synchronize various CIs from Device42 to Freshservice.
 In the <api> section of each task, there will be a <resource> section that queries Device42 to obtain the desired CIs. 
 Full documentation of the Device42 API and endpoints is available at https://api.device42.com. 
 Individual tasks within a mapping.xml file can be enabled or disabled at will by changing the `enable="true"` to `enable="false"` in the <task> section.
 
-Once the Device42 API resource and FreshService Target are entered, the <mapping> section is where fields from Device42 (the `resource` value) can be mapped to fields in FreshService (the `target` value).
+Once the Device42 API resource and Freshservice Target are entered, the <mapping> section is where fields from Device42 (the `resource` value) can be mapped to fields in Freshservice (the `target` value).
 It is very important to adjust the list of default values in accordance between freshservice and device 42 (for example, service_level).
 
 After configuring the fields to map as needed, the script should be ready to run. 
 
 ### Gotchas
 -----------------------------
-* FreshService API Limit is 1000 calls per hour (https://api.freshservice.com/#ratelimit)
-* Due to the nature of FreshService rate limits, large inventories may take extended periods of time to migrate
+* Freshservice API Limit is 1000 calls per hour (https://api.freshservice.com/#ratelimit)
+* Due to the nature of Freshservice rate limits, large inventories may take extended periods of time to migrate
 
 Please use the following table as a reference only, actual times may vary due to request limit cooldowns and other internal API calls
 
@@ -82,7 +82,7 @@ Please use the following table as a reference only, actual times may vary due to
 
 ### Info
 -----------------------------
-* mapping.xml - file from where we get fields relations between D42 and FreshService
+* mapping.xml - file from where we get fields relations between D42 and Freshservice
 * devicd42.py - file with integration device42 instance
 * freshservice.py - file with integration freshservice instance
 * d42_sd_sync.py - initialization and processing file, where we prepare API calls
diff --git a/d42_sd_sync.py b/d42_sd_sync.py
index 30a7722..7002c08 100755
--- a/d42_sd_sync.py
+++ b/d42_sd_sync.py
@@ -310,7 +310,7 @@ def update_objects_from_server(sources, _target, mapping):
                             try:
                                 value = int(value)
                             except Exception as e:
-                                logger.error(str(e))
+                                logger.exception(str(e))
                                 is_valid = False
 
                         elif target_type == "dropdown":
@@ -327,7 +327,7 @@ def update_objects_from_server(sources, _target, mapping):
                                 else:
                                     value = option
                             except Exception as e:
-                                logger.error(str(e))
+                                logger.exception(str(e))
                                 is_valid = False
 
                     if not is_valid:
@@ -372,7 +372,7 @@ def update_objects_from_server(sources, _target, mapping):
                 break
             except Exception as e:
                 log = "Error (%s) updating device %s" % (str(e), source["name"])
-                logger.error(log)
+                logger.exception(log)
                 break
 
 
@@ -397,7 +397,7 @@ def delete_objects_from_server(sources, _target, mapping):
                 logger.info("deleted asset %s" % existing_object["name"])
             except Exception as e:
                 log = "Error (%s) deleting device %s" % (str(e), existing_object["name"])
-                logger.error(log)
+                logger.exception(log)
 
 
 def update_softwares_from_server(sources, _target, mapping):
@@ -435,7 +435,7 @@ def update_softwares_from_server(sources, _target, mapping):
                 logger.info("updated existing software %d" % updated_software_id)
         except Exception as e:
             log = "Error (%s) updating software %s" % (str(e), source["name"])
-            logger.error(log)
+            logger.exception(log)
 
 
 def delete_softwares_from_server(sources, _target, mapping):
@@ -459,7 +459,7 @@ def delete_softwares_from_server(sources, _target, mapping):
                 logger.info("deleted software %s" % existing_object["name"])
             except Exception as e:
                 log = "Error (%s) deleting software %s" % (str(e), existing_object["name"])
-                logger.error(log)
+                logger.exception(log)
 
 
 def update_products_from_server(sources, _target, mapping):
@@ -501,7 +501,7 @@ def update_products_from_server(sources, _target, mapping):
                 logger.info("updated existing product %d" % updated_product_id)
         except Exception as e:
             log = "Error (%s) updating product %s" % (str(e), source["name"])
-            logger.error(log)
+            logger.exception(log)
 
 
 def create_installation_from_software_in_use(sources, _target, mapping):
@@ -537,12 +537,12 @@ def create_installation_from_software_in_use(sources, _target, mapping):
 
             if asset is None:
                 log = "There is no asset(%s) in FS." % source[mapping["@device-name"]]
-                logger.error(log)
+                logger.exception(log)
                 continue
 
             if software is None:
                 log = "There is no software(%s) in FS." % source[mapping["@software-name"]]
-                logger.error(log)
+                logger.exception(log)
                 continue
 
             if software["id"] not in software_to_assets_map:
@@ -566,7 +566,7 @@ def create_installation_from_software_in_use(sources, _target, mapping):
             logger.info("added installation %s-%s" % (source[mapping["@device-name"]], source[mapping["@software-name"]]))
         except Exception as e:
             log = "Error (%s) creating installation %s" % (str(e), source[mapping["@device-name"]])
-            logger.error(log)
+            logger.exception(log)
 
 
 def create_relationships_from_affinity_group(sources, _target, mapping):
@@ -606,14 +606,14 @@ def create_relationships_from_affinity_group(sources, _target, mapping):
 
             if primary_asset is None:
                 log = "There is no dependent asset(%s) in FS." % source[mapping["@key"]]
-                logger.error(log)
+                logger.exception(log)
                 continue
 
             secondary_asset = find_object_in_map(existing_objects_map, source[mapping["@target-key"]])
 
             if secondary_asset is None:
                 log = "There is no dependency asset(%s) in FS." % source[mapping["@target-key"]]
-                logger.error(log)
+                logger.exception(log)
                 continue
 
             primary_asset_display_id = primary_asset["display_id"]
@@ -651,7 +651,7 @@ def create_relationships_from_affinity_group(sources, _target, mapping):
                 del relationships_to_create[:]
         except Exception as e:
             log = "Error (%s) creating relationship %s" % (str(e), source[mapping["@key"]])
-            logger.error(log)
+            logger.exception(log)
 
     # We may not have submitted the last batch of relationships to create if the last item in
     # sources did not result in a relationship needing to be created (e.g. one of the assets
@@ -697,7 +697,7 @@ def create_relationships_from_affinity_group(sources, _target, mapping):
                         for relationship in job["relationships"]:
                             if not relationship["success"]:
                                 log = "Job %s failed to create relationship: %s" % (job_to_check["job_id"], relationship)
-                                logger.error(log)
+                                logger.exception(log)
                     elif status in ["queued", "in progress"]:
                         # The job has not completed yet.
                         next_jobs_to_check.append(job_to_check)
@@ -936,7 +936,7 @@ def update_contracts_from_server(sources, _target, mapping):
                             try:
                                 value = int(value)
                             except Exception as e:
-                                logger.error(str(e))
+                                logger.exception(str(e))
                                 is_valid = False
 
                     if not is_valid:
@@ -971,7 +971,7 @@ def update_contracts_from_server(sources, _target, mapping):
                 break
             except Exception as e:
                 log = "Error (%s) updating contract %s" % (str(e), source["name"])
-                logger.error(log)
+                logger.exception(log)
                 break
 
 
@@ -1010,12 +1010,12 @@ def create_association_between_asset_and_contract(sources, _target, mapping):
 
             if asset is None:
                 log = "There is no asset(%s) in FS." % source[mapping["@device-name"]]
-                logger.error(log)
+                logger.exception(log)
                 continue
 
             if contract is None:
                 log = "There is no contract(%s) in FS." % source[mapping["@contract-name"]]
-                logger.error(log)
+                logger.exception(log)
                 continue
 
             if contract["id"] not in contract_to_assets_map:
@@ -1035,7 +1035,7 @@ def create_association_between_asset_and_contract(sources, _target, mapping):
             logger.info("added associated asset %s-%s" % (source[mapping["@device-name"]], source[mapping["@contract-name"]]))
         except Exception as e:
             log = "Error (%s) creating associated assets %s-%s" % (str(e), source[mapping["@device-name"]], source[mapping["@contract-name"]])
-            logger.error(log)
+            logger.exception(log)
 
 
 def parse_config(url):
@@ -1119,10 +1119,10 @@ def get_agent_from_freshservice(email):
     try:
         agents = freshservice.get_all_agents()
         for agent in agents:
-            if agent['email'] == email:
+            if agent['email'].lower() == email.lower():
                 return agent['id']
     except Exception as e:
-        logger.error(str(e))
+        logger.exception(str(e))
 
     return default_approver
 

From 047b4b8a92ac06d5b29ff5e3292c1c561f495ecd Mon Sep 17 00:00:00 2001
From: Roman Nyschuk <roman.nyschuk@device42.com>
Date: Mon, 10 Jul 2023 20:55:24 +0300
Subject: [PATCH 4/4] Update several comments

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 487b3aa..42a486d 100644
--- a/README.md
+++ b/README.md
@@ -35,10 +35,10 @@ These can all be installed by running pip install -r requirements.txt.
 In order to run the legacy migration, you will also need to modify the mapping.xml file so that the legacy mapping options are used
 
 modify the following line so that `enable` is set to false for the v2_views
-```enable="false" description="Copy Servers from Device42 to Freshservice using DOQL v2_views"```
+```enable="false" description="Copy Servers from Device42 to FreshService using DOQL v2_views"```
 
 modify the following line so that `enable` is set to true for the v1_views
-```enable="true" description="Copy Servers from Device42 to Freshservice using DOQL v1_views"```
+```enable="true" description="Copy Servers from Device42 to FreshService using DOQL v1_views"```
 
 Once the packages are installed and the script is configured, the script can be run by this command: python d42_sd_sync.py.