Isssues/table renaming

Components/FeatureController.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace Dnn.WebAnalytics.Components
+{
+    public class FeatureController
+    {
+    }
+}

Components/VisitorTracker.cs

@@ -2,17 +2,17 @@
 using System.Web;
 using DotNetNuke.Entities.Portals;
 using DotNetNuke.Entities.Users;
-using System.Linq;
+using DotNetNuke.Instrumentation;
 using DotNetNuke.Services.Exceptions;
 
 namespace Dnn.WebAnalytics
 {
     public class VisitorTracker : IHttpModule
     {
+        private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(VisitorTracker));
         private System.Text.RegularExpressions.Regex UserAgentFilter = new System.Text.RegularExpressions.Regex(VisitController.UserAgentFilter, System.Text.RegularExpressions.RegexOptions.Compiled | System.Text.RegularExpressions.RegexOptions.IgnoreCase);
         VisitController visitController = new VisitController();
-        VisitorController visitorController = new VisitorController();
-        DataContext dc = new DataContext();
+        private VisitorInfoRepo visitorRepo = new VisitorInfoRepo();
 
         public string ModuleName
         {
@@ -52,14 +52,14 @@ public void OnEndRequest(object s, EventArgs e)
                 }
 
                 // update/create visitor 
-                var visitor = dc.Visitors.Where(i => i.id == visitor_id).SingleOrDefault();
+                var visitor = visitorRepo.GetItem(visitor_id, _portalSettings.PortalId);
                 if (visitor == null)
                 { // create Visitor record 
-                    visitor = new Visitor()
+                    visitor = new VisitorInfo()
                     {
                         created_on_date = DateTime.Now
                     };
-                    dc.Visitors.InsertOnSubmit(visitor);
+                    visitorRepo.CreateItem(visitor);
                 }
 
                 // get User if authenticated
@@ -77,7 +77,7 @@ public void OnEndRequest(object s, EventArgs e)
                 {
                     visitor.user_id = user_id;
                 }
-                dc.SubmitChanges();
+                visitorRepo.UpdateItem(visitor);
 
                 // only process requests for content pages
                 if (_portalSettings != null && Request.Url.LocalPath.ToLower().EndsWith("default.aspx"))
@@ -170,46 +170,47 @@ public void OnEndRequest(object s, EventArgs e)
                         string user_agent = Request.UserAgent;
 
                         // create visit object
-                        VisitDTO visitDTO = new VisitDTO()
+                        var visitDto = new VisitDTO()
                         {
                             date = DateTime.Now,
                             visitor_id = visitor.id,
                             tab_id = _portalSettings.ActiveTab.TabID,
                             ip = ip,
-                            country = "",
-                            region = "",
-                            city = "",
-                            latitude = "",
-                            longitude = "",
+                            country = string.Empty,
+                            region = string.Empty,
+                            city = string.Empty,
+                            latitude = string.Empty,
+                            longitude = string.Empty,
                             language = language,
                             domain = domain,
                             url = url,
                             user_agent = user_agent,
                             device_type = "Desktop",
-                            device = "",
-                            platform = "",
-                            browser = "",
+                            device = string.Empty,
+                            platform = string.Empty,
+                            browser = string.Empty,
                             referrer_domain = domain_referrer,
                             referrer_url = url_referrer,
-                            server = "",
+                            server = string.Empty,
                             activity = "click",
                             campaign = campaign,
                             session_id = session_id,
                             request_id = request_id,
                             last_request_id = last_request_id
                         };
 
-                        visitDTO = visitController.ProcessVisit(visitDTO);
+                        visitDto = visitController.ProcessVisit(visitDto);
 
-                        Visit visit = visitController.ConvertDtoToItem(null, visitDTO);
+                        VisitInfo visit = visitController.ConvertDtoToItem(null, visitDto);
 
-                        dc.Visits.InsertOnSubmit(visit);
-                        dc.SubmitChanges();
+                        var repo = new VisitInfoRepo();
+                        repo.CreateItem(visit);
                     }
                 }
             }
             catch (Exception ex)
             {
+                Logger.Error(ex.Message, ex);
                 Exceptions.LogException(ex);
             }
         }

Controllers/MapController.cs

@@ -1,4 +1,5 @@
-using DotNetNuke.Security;
+using DotNetNuke.Instrumentation;
+using DotNetNuke.Security;
 using DotNetNuke.Services.Exceptions;
 using DotNetNuke.Web.Api;
 using System;
@@ -12,11 +13,10 @@
 
 namespace Dnn.WebAnalytics
 {
-    //[SupportedModules("Dnn.WebAnalytics")]
-    //[ValidateAntiForgeryToken]
     public class MapController : DnnApiController
     {
-        DataContext dc = new DataContext();
+        private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(MapController));
+        private VisitInfoRepo visitRepo = new VisitInfoRepo();
 
         [HttpGet]
         [DnnModuleAuthorize(AccessLevel = SecurityAccessLevel.View)]
@@ -27,10 +27,10 @@ public HttpResponseMessage Get(int minutes)
             {
                 List<MapDTO> dtos = new List<MapDTO>();
 
-                List<Visit> recent_visits = dc.Visits
+                List<VisitInfo> recent_visits = visitRepo.GetItemsAll()
                     .Where(i =>
                         i.date >= DateTime.Now.AddMinutes(-minutes) &&
-                        i.latitude != "" && i.longitude != ""
+                        i.latitude != string.Empty && i.longitude != string.Empty
                     )
                     .ToList();
 
@@ -46,7 +46,7 @@ public HttpResponseMessage Get(int minutes)
 
                 foreach (long id in ids)
                 {
-                    var visit = dc.Visits.Where(i => i.id == id).SingleOrDefault();
+                    var visit = visitRepo.GetItemById((int)id);  // this may need to be debugged and/or handled better later
                     if (visit != null)
                     {
                         MapDTO mapDTO = new MapDTO()
@@ -56,14 +56,14 @@ public HttpResponseMessage Get(int minutes)
                             longitude = visit.longitude
                         };
                         dtos.Add(mapDTO);
-
                     }
                 }
 
                 return Request.CreateResponse(HttpStatusCode.OK, dtos);
             }
             catch (Exception ex)
             {
+                Logger.Error(ex.Message, ex);
                 Exceptions.LogException(ex);
                 return Request.CreateResponse(HttpStatusCode.InternalServerError, ex);
             }
@@ -107,6 +107,7 @@ public HttpResponseMessage Get()
             }
             catch (Exception ex)
             {
+                Logger.Error(ex.Message, ex);
                 Exceptions.LogException(ex);
                 return Request.CreateResponse(HttpStatusCode.InternalServerError, ex);
             }