Skip to content

Commit cea1551

Browse files
X3TechnologyX3Technology
authored
Merge pull request #8 from mathisjay/master
Fix db objects names
2 parents 78bc012 + b61484e commit cea1551

19 files changed

Lines changed: 546 additions & 506 deletions

‎Components/VisitorTracker.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ public void OnEndRequest(object s, EventArgs e)
5252
}
5353

5454
// update/create visitor
55-
var visitor = dc.Visitors.Where(i => i.id == visitor_id).SingleOrDefault();
55+
var visitor = dc.Community_Visitors.Where(i => i.id == visitor_id).SingleOrDefault();
5656
if (visitor == null)
5757
{ // create Visitor record
58-
visitor = new Visitor()
58+
visitor = new Community_Visitor()
5959
{
6060
created_on_date = DateTime.Now
6161
};
62-
dc.Visitors.InsertOnSubmit(visitor);
62+
dc.Community_Visitors.InsertOnSubmit(visitor);
6363
}
6464

6565
// get User if authenticated
@@ -201,9 +201,9 @@ public void OnEndRequest(object s, EventArgs e)
201201

202202
visitDTO = visitController.ProcessVisit(visitDTO);
203203

204-
Visit visit = visitController.ConvertDtoToItem(null, visitDTO);
204+
Community_Visit visit = visitController.ConvertDtoToItem(null, visitDTO);
205205

206-
dc.Visits.InsertOnSubmit(visit);
206+
dc.Community_Visits.InsertOnSubmit(visit);
207207
dc.SubmitChanges();
208208
}
209209
}

‎Controllers/MapController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public HttpResponseMessage Get(int minutes)
2727
{
2828
List<MapDTO> dtos = new List<MapDTO>();
2929

30-
List<Visit> recent_visits = dc.Visits
30+
List<Community_Visit> recent_visits = dc.Community_Visits
3131
.Where(i =>
3232
i.date >= DateTime.Now.AddMinutes(-minutes) &&
3333
i.latitude != "" && i.longitude != ""
@@ -46,12 +46,12 @@ public HttpResponseMessage Get(int minutes)
4646

4747
foreach (long id in ids)
4848
{
49-
var visit = dc.Visits.Where(i => i.id == id).SingleOrDefault();
49+
var visit = dc.Community_Visits.Where(i => i.id == id).SingleOrDefault();
5050
if (visit != null)
5151
{
5252
MapDTO mapDTO = new MapDTO()
5353
{
54-
user_id = visit.Visitor.user_id,
54+
user_id = visit.Community_Visitor.user_id,
5555
latitude = visit.latitude,
5656
longitude = visit.longitude
5757
};

‎Controllers/VisitController.cs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class VisitController : DnnApiController
2222
public static string UserAgentFilter = "bot|crawl|spider|sbider|ask|slurp|larbin|search|indexer|archiver|nutch|capture|scanalert";
2323

2424
[NonAction]
25-
public VisitDTO ConvertItemToDto(Visit item)
25+
public VisitDTO ConvertItemToDto(Community_Visit item)
2626
{
2727
VisitDTO dto = new VisitDTO();
2828

@@ -55,11 +55,11 @@ public VisitDTO ConvertItemToDto(Visit item)
5555
return dto;
5656
}
5757
[NonAction]
58-
public Visit ConvertDtoToItem(Visit item, VisitDTO dto)
58+
public Community_Visit ConvertDtoToItem(Community_Visit item, VisitDTO dto)
5959
{
6060
if (item == null)
6161
{
62-
item = new Visit();
62+
item = new Community_Visit();
6363
}
6464

6565
if (dto == null)
@@ -105,9 +105,9 @@ public HttpResponseMessage Get()
105105
{
106106
List<VisitDTO> dtos = new List<VisitDTO>();
107107

108-
var query = dc.Visits.AsQueryable();
108+
var query = dc.Community_Visits.AsQueryable();
109109

110-
foreach (Visit item in query)
110+
foreach (Community_Visit item in query)
111111
{
112112
VisitDTO dto = ConvertItemToDto(item);
113113
dtos.Add(dto);
@@ -129,7 +129,7 @@ public HttpResponseMessage Get(int id)
129129
{
130130
try
131131
{
132-
Visit item = dc.Visits.Where(i => i.id == id).SingleOrDefault();
132+
Community_Visit item = dc.Community_Visits.Where(i => i.id == id).SingleOrDefault();
133133

134134
if (item == null)
135135
{
@@ -151,7 +151,7 @@ public HttpResponseMessage Get(int portal_id, Nullable<DateTime> period_start, N
151151
{
152152
try
153153
{
154-
var query = dc.Visits.Where(i => i.Tab.PortalID == portal_id);
154+
var query = dc.Community_Visits.Where(i => i.Tab.PortalID == portal_id);
155155

156156
if (period_start.HasValue)
157157
{
@@ -170,7 +170,7 @@ public HttpResponseMessage Get(int portal_id, Nullable<DateTime> period_start, N
170170
view_count = list.Count(),
171171
visit_count = list.Select(i => i.session_id).Distinct().Count(),
172172
visitor_count = list.Select(i => i.visitor_id).Distinct().Count(),
173-
user_count = list.Where(i => i.Visitor.user_id.HasValue).Select(i => i.visitor_id).Distinct().Count(),
173+
user_count = list.Where(i => i.Community_Visitor.user_id.HasValue).Select(i => i.visitor_id).Distinct().Count(),
174174

175175
views = GetViews(portal_id, period_start, period_end),
176176
visits = GetVisits(portal_id, period_start, period_end),
@@ -195,7 +195,7 @@ public HttpResponseMessage Get(string field, int portal_id, Nullable<DateTime> p
195195
{
196196
List<ReportDTO> results = new List<ReportDTO>();
197197

198-
var query = dc.Visits.Where(i => i.Tab.PortalID == portal_id );
198+
var query = dc.Community_Visits.Where(i => i.Tab.PortalID == portal_id);
199199

200200
if (period_start.HasValue)
201201
{
@@ -209,7 +209,7 @@ public HttpResponseMessage Get(string field, int portal_id, Nullable<DateTime> p
209209

210210
var list = query.ToList();
211211

212-
IEnumerable<IGrouping<string, Visit>> grouped = null;
212+
IEnumerable<IGrouping<string, Community_Visit>> grouped = null;
213213

214214
switch (field)
215215
{
@@ -230,7 +230,7 @@ public HttpResponseMessage Get(string field, int portal_id, Nullable<DateTime> p
230230
break;
231231

232232
case "user":
233-
grouped = list.Where(i => i.Visitor.user_id.HasValue).GroupBy(i => i.Visitor.User.DisplayName);
233+
grouped = list.Where(i => i.Community_Visitor.user_id.HasValue).GroupBy(i => i.Community_Visitor.User.DisplayName);
234234
break;
235235

236236
case "page":
@@ -372,14 +372,14 @@ public HttpResponseMessage Delete(int id)
372372
{
373373
try
374374
{
375-
Visit item = dc.Visits.Where(i => i.id == id).SingleOrDefault();
375+
Community_Visit item = dc.Community_Visits.Where(i => i.id == id).SingleOrDefault();
376376

377377
if (item == null)
378378
{
379379
return Request.CreateResponse(HttpStatusCode.NotFound);
380380
}
381381

382-
dc.Visits.DeleteOnSubmit(item);
382+
dc.Community_Visits.DeleteOnSubmit(item);
383383
dc.SubmitChanges();
384384

385385
return Request.CreateResponse(HttpStatusCode.OK);
@@ -389,18 +389,18 @@ public HttpResponseMessage Delete(int id)
389389
Exceptions.LogException(ex);
390390
return Request.CreateResponse(HttpStatusCode.InternalServerError, ex);
391391
}
392-
}
392+
}
393393

394394
[NonAction]
395395
public VisitDTO SaveVisit(VisitDTO dto)
396396
{
397-
Visit visit = dc.Visits.Where(i => i.id == dto.id).SingleOrDefault();
397+
Community_Visit visit = dc.Community_Visits.Where(i => i.id == dto.id).SingleOrDefault();
398398

399399
if (visit == null)
400400
{
401401
visit = ConvertDtoToItem(null, dto);
402402

403-
dc.Visits.InsertOnSubmit(visit);
403+
dc.Community_Visits.InsertOnSubmit(visit);
404404
}
405405

406406
visit = ConvertDtoToItem(visit, dto);
@@ -414,7 +414,7 @@ public VisitDTO SaveVisit(VisitDTO dto)
414414
//public void WriteVisits()
415415
//{
416416
// List<VisitDTO> visit_dtos = new List<VisitDTO>();
417-
417+
418418
// // dictionary to store visitors to update
419419
// Dictionary<int, Nullable<int>> dicVisitors = new Dictionary<int, Nullable<int>>();
420420

@@ -446,7 +446,7 @@ public VisitDTO SaveVisit(VisitDTO dto)
446446

447447
// HttpRuntime.Cache.Remove(Key);
448448
// }
449-
449+
450450
// //// iterate through all visitors that need to be updated
451451
// //foreach (KeyValuePair<int, Nullable<int>> kvp in dicVisitors)
452452
// //{
@@ -560,15 +560,15 @@ public VisitDTO ProcessVisit(VisitDTO visit)
560560
public void PurgeVisits()
561561
{
562562
// delete all visit history older than 90 days
563-
List<Visit> visits = dc.Visits.Where(i => i.date.Date < DateTime.Now.AddDays(-90).Date).ToList();
564-
dc.Visits.DeleteAllOnSubmit(visits);
563+
List<Community_Visit> visits = dc.Community_Visits.Where(i => i.date.Date < DateTime.Now.AddDays(-90).Date).ToList();
564+
dc.Community_Visits.DeleteAllOnSubmit(visits);
565565
dc.SubmitChanges();
566566
}
567-
567+
568568
[NonAction]
569569
public List<DateCountDTO> GetViews(int portal_id, Nullable<DateTime> start_date, Nullable<DateTime> end_date)
570570
{
571-
var query = dc.Visits.Where(i => i.Tab.PortalID == portal_id);
571+
var query = dc.Community_Visits.Where(i => i.Tab.PortalID == portal_id);
572572

573573
if (start_date.HasValue)
574574
{
@@ -598,7 +598,7 @@ public List<DateCountDTO> GetViews(int portal_id, Nullable<DateTime> start_date,
598598
[NonAction]
599599
public List<DateCountDTO> GetVisits(int portal_id, Nullable<DateTime> start_date, Nullable<DateTime> end_date)
600600
{
601-
var query = dc.Visits.Where(i => i.Tab.PortalID == portal_id);
601+
var query = dc.Community_Visits.Where(i => i.Tab.PortalID == portal_id);
602602

603603
if (start_date.HasValue)
604604
{
@@ -628,7 +628,7 @@ public List<DateCountDTO> GetVisits(int portal_id, Nullable<DateTime> start_date
628628
[NonAction]
629629
public List<DateCountDTO> GetVisitors(int portal_id, Nullable<DateTime> start_date, Nullable<DateTime> end_date)
630630
{
631-
var query = dc.Visits.Where(i => i.Tab.PortalID == portal_id);
631+
var query = dc.Community_Visits.Where(i => i.Tab.PortalID == portal_id);
632632

633633
if (start_date.HasValue)
634634
{
@@ -658,7 +658,7 @@ public List<DateCountDTO> GetVisitors(int portal_id, Nullable<DateTime> start_da
658658
[NonAction]
659659
public List<DateCountDTO> GetUsers(int portal_id, Nullable<DateTime> start_date, Nullable<DateTime> end_date)
660660
{
661-
var query = dc.Visits.Where(i => i.Tab.PortalID == portal_id);
661+
var query = dc.Community_Visits.Where(i => i.Tab.PortalID == portal_id);
662662

663663
if (start_date.HasValue)
664664
{
@@ -677,7 +677,7 @@ public List<DateCountDTO> GetUsers(int portal_id, Nullable<DateTime> start_date,
677677
.Select(i => new DateCountDTO()
678678
{
679679
date = i.Key,
680-
count = i.Select(o => o.Visitor.user_id).Distinct().Count()
680+
count = i.Select(o => o.Community_Visitor.user_id).Distinct().Count()
681681
})
682682
.OrderBy(i => i.date)
683683
.ToList();

‎Controllers/VisitorController.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class VisitorController : DnnApiController
1919
DataContext dc = new DataContext();
2020

2121
[NonAction]
22-
public VisitorDTO ConvertItemToDto(Visitor item)
22+
public VisitorDTO ConvertItemToDto(Community_Visitor item)
2323
{
2424
VisitorDTO dto = new VisitorDTO();
2525

@@ -34,11 +34,11 @@ public VisitorDTO ConvertItemToDto(Visitor item)
3434
return dto;
3535
}
3636
[NonAction]
37-
public Visitor ConvertDtoToItem(Visitor item, VisitorDTO dto)
37+
public Community_Visitor ConvertDtoToItem(Community_Visitor item, VisitorDTO dto)
3838
{
3939
if (item == null)
4040
{
41-
item = new Visitor();
41+
item = new Community_Visitor();
4242
}
4343

4444
if (dto == null)
@@ -63,8 +63,8 @@ public HttpResponseMessage Get()
6363
{
6464
List<VisitorDTO> dtos = new List<VisitorDTO>();
6565

66-
var visitors = dc.Visitors.ToList();
67-
foreach (Visitor visitor in visitors)
66+
var visitors = dc.Community_Visitors.ToList();
67+
foreach (Community_Visitor visitor in visitors)
6868
{
6969
VisitorDTO visitorDTO = ConvertItemToDto(visitor);
7070
dtos.Add(visitorDTO);
@@ -85,7 +85,7 @@ public HttpResponseMessage Get(int id)
8585
{
8686
try
8787
{
88-
Visitor item = dc.Visitors.Where(i => i.id == id).SingleOrDefault();
88+
Community_Visitor item = dc.Community_Visitors.Where(i => i.id == id).SingleOrDefault();
8989

9090
if (item == null)
9191
{
@@ -141,14 +141,14 @@ public HttpResponseMessage Delete(int id)
141141
{
142142
try
143143
{
144-
Visitor item = dc.Visitors.Where(i => i.id == id).SingleOrDefault();
144+
Community_Visitor item = dc.Community_Visitors.Where(i => i.id == id).SingleOrDefault();
145145

146146
if (item == null)
147147
{
148148
return Request.CreateResponse(HttpStatusCode.NotFound);
149149
}
150150

151-
dc.Visitors.DeleteOnSubmit(item);
151+
dc.Community_Visitors.DeleteOnSubmit(item);
152152
dc.SubmitChanges();
153153

154154
return Request.CreateResponse(HttpStatusCode.OK);
@@ -163,14 +163,14 @@ public HttpResponseMessage Delete(int id)
163163
[NonAction]
164164
public VisitorDTO SaveVisitor(VisitorDTO dto)
165165
{
166-
Visitor visitor = dc.Visitors.Where(i => i.id == dto.id).SingleOrDefault();
166+
Community_Visitor visitor = dc.Community_Visitors.Where(i => i.id == dto.id).SingleOrDefault();
167167

168168
if (visitor == null)
169169
{
170170
visitor = ConvertDtoToItem(null, dto);
171171
visitor.created_on_date = DateTime.Now;
172172

173-
dc.Visitors.InsertOnSubmit(visitor);
173+
dc.Community_Visitors.InsertOnSubmit(visitor);
174174
}
175175

176176
visitor = ConvertDtoToItem(visitor, dto);

0 commit comments

Comments
 (0)