Skip to content

Commit

Permalink
- Committing code after applying exception handler
Browse files Browse the repository at this point in the history
- Solved ID issue
  • Loading branch information
MandarTisge committed Nov 26, 2014
1 parent 01e3cc5 commit f9ab984
Show file tree
Hide file tree
Showing 14 changed files with 156 additions and 71 deletions.
10 changes: 10 additions & 0 deletions FSDTS/Business Objects/UserBO.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ public class UserBO
/// </summary>
private FSDTSContext db = new FSDTSContext();

/// <summary>
/// SymmetricEncryptData method of UserBO class.
/// </summary>
/// <param name="clearText">string clearText</param>
/// <returns>Encrypted string</returns>
public static string SymmetricEncryptData(string clearText)
{
////create a byte array to store the encrypted result.
Expand Down Expand Up @@ -59,6 +64,11 @@ public static string SymmetricEncryptData(string clearText)
return Convert.ToBase64String(encryptedText);
}

/// <summary>
/// SymmetricDecryptData method of UserBO class.
/// </summary>
/// <param name="cypherText">string cypherText</param>
/// <returns>Decrypted string</returns>
public static string SymmetricDecryptData(string cypherText)
{
////create a byte array to store the encrypted result.
Expand Down
3 changes: 3 additions & 0 deletions FSDTS/Common/CustomValidators.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ protected override ValidationResult IsValid(object value, ValidationContext vali
}
}

/// <summary>
/// class to validate unique email and common groupings name.
/// </summary>
public class UniqueAttribute : ValidationAttribute
{
protected override ValidationResult IsValid(object value, ValidationContext validationContext)
Expand Down
8 changes: 7 additions & 1 deletion FSDTS/Controllers/CommonProgramsGroupingController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

namespace FSDTS.Controllers
{
[FsdtsExceptionHandler]
public class CommonProgramsGroupingController : ApiController
{
/// <summary>
Expand All @@ -34,7 +35,7 @@ public class CommonProgramsGroupingController : ApiController
public IQueryable<CommonProgramsGrouping> GetCommonGrouping()
{
Log.Info(FsdtsConstants.GettingItemList);
return db.CommonGrouping.Where(p => p.IsDeleted == false).OrderBy(p => p.CommonProgramsGroupingName).AsQueryable();
return db.CommonGrouping.Where(p => p.IsDeleted == false).OrderBy(p => p.CommonProgramsGroupingName).AsQueryable();
}

// GET api/CommonProgramsGrouping/5
Expand All @@ -53,6 +54,7 @@ public IHttpActionResult GetCommonProgramsGrouping(int id)
}

// PUT api/CommonProgramsGrouping/5
[FsdtsExceptionHandler]
public IHttpActionResult PutCommonProgramsGrouping(int id, CommonProgramsGrouping commonprogramsgrouping)
{
if (!ModelState.IsValid)
Expand Down Expand Up @@ -88,6 +90,7 @@ public IHttpActionResult PutCommonProgramsGrouping(int id, CommonProgramsGroupin
}

[AcceptVerbs("PATCH")]
[FsdtsExceptionHandler]
public HttpResponseMessage PatchCommonProgram(int id, Delta<CommonProgramsGrouping> commonprogram)
{
FSDTSContext objContext = new FSDTSContext();
Expand Down Expand Up @@ -122,6 +125,7 @@ public IHttpActionResult PostCommonProgramsGrouping(CommonProgramsGrouping commo

// DELETE api/CommonProgramsGrouping/5
[ResponseType(typeof(CommonProgramsGrouping))]
[FsdtsExceptionHandler]
public IHttpActionResult DeleteCommonProgramsGrouping(int id)
{
CommonProgramsGrouping commonprogramsgrouping = db.CommonGrouping.Find(id);
Expand All @@ -136,6 +140,7 @@ public IHttpActionResult DeleteCommonProgramsGrouping(int id)
return Ok(commonprogramsgrouping);
}

[FsdtsExceptionHandler]
protected override void Dispose(bool disposing)
{
if (disposing)
Expand All @@ -145,6 +150,7 @@ protected override void Dispose(bool disposing)
base.Dispose(disposing);
}

[FsdtsExceptionHandler]
private bool CommonProgramsGroupingExists(int id)
{
return db.CommonGrouping.Count(e => e.CommonProgramsGroupingId == id) > 0;
Expand Down
17 changes: 13 additions & 4 deletions FSDTS/Controllers/CourseController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ namespace FSDTS.Controllers
using FSDTS.Common;
using FSDTS.Models;
using log4net;

/// <summary>
/// CourseController class.
/// For CRUD operation related to Course.
/// </summary>
[FsdtsExceptionHandler]
public class CourseController : ApiController
{
/// <summary>
Expand All @@ -48,7 +49,7 @@ public class CourseController : ApiController
/// </summary>
/// <returns>List of Courses</returns>
[FsdtsExceptionHandler]
public IQueryable<Course> GetCourse()
public IQueryable<Course> GetCourse()
{
Log.Info(FsdtsConstants.GettingItemList);
return this.db.Course.OrderBy(cr => cr.CourseName);
Expand Down Expand Up @@ -80,9 +81,17 @@ public IHttpActionResult GetCourse(int id)
/// </summary>
/// <param name="Oid">Integer Organization ID</param>
/// <returns>List of Courses related to Organization ID</returns>
public IQueryable<Course> GetCoursesByOrgId(int Oid)
[FsdtsExceptionHandler]
public IQueryable<Course> GetCoursesByOrgId(int? Oid)
{
return this.db.Course.Where(co => co.OrganizationId == Oid).AsQueryable();
if (Oid != null)
{
return this.db.Course.Where(co => co.OrganizationId == Oid).AsQueryable();
}
else
{
throw new NullReferenceException("Organization ID you have entered is not correct.");
}
}

/// <summary>
Expand Down
13 changes: 11 additions & 2 deletions FSDTS/Controllers/CredentialController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace FSDTS.Controllers
/// CredentialController class.
/// For CRUD operation related to Credential.
/// </summary>
[FsdtsExceptionHandler]
public class CredentialController : ApiController
{
/// <summary>
Expand Down Expand Up @@ -79,9 +80,17 @@ public IHttpActionResult GetCredential(int id)
/// </summary>
/// <param name="Oid"></param>
/// <returns></returns>
public IQueryable<Credential> GetCredentialsByOrgId(int Oid)
[FsdtsExceptionHandler]
public IQueryable<Credential> GetCredentialsByOrgId(int? Oid)
{
return db.Credential.Where(cr => cr.OrganizationId == Oid).AsQueryable();
if (Oid != null)
{
return db.Credential.Where(cr => cr.OrganizationId == Oid).AsQueryable();
}
else
{
throw new NullReferenceException("Organization ID you have entered is not correct.");
}
}

/// <summary>
Expand Down
1 change: 1 addition & 0 deletions FSDTS/Controllers/MeasureController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace FSDTS.Controllers
/// MeasureController class.
/// For CRUD operation related to Measure.
/// </summary>
[FsdtsExceptionHandler]
public class MeasureController : ApiController
{
/// <summary>
Expand Down
1 change: 1 addition & 0 deletions FSDTS/Controllers/OrganizationController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace FSDTS.Controllers
/// OrganizationController class.
/// For CRUD operation related to Organization.
/// </summary>
[FsdtsExceptionHandler]
public class OrganizationController : ApiController
{
/// <summary>
Expand Down
12 changes: 10 additions & 2 deletions FSDTS/Controllers/PeriodController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,17 @@ public IHttpActionResult GetPeriod(int id)
/// </summary>
/// <param name="Oid"></param>
/// <returns></returns>
public IQueryable<Period> GetPeriodsByPrgId(int Prjid)
[FsdtsExceptionHandler]
public IQueryable<Period> GetPeriodsByPrgId(int? Prjid)
{
return db.Period.Where(pd => pd.ProjectId == Prjid & pd.IsDeleted == false).AsQueryable();
if (Prjid != null)
{
return db.Period.Where(pd => pd.ProjectId == Prjid & pd.IsDeleted == false).AsQueryable();
}
else
{
throw new NullReferenceException("Project ID you have entered is not correct.");
}
}

// PUT api/Period/5
Expand Down
10 changes: 9 additions & 1 deletion FSDTS/Controllers/ProgramController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace FSDTS.Controllers
/// ProgramController class.
/// For CRUD operation related to Program.
/// </summary>
[FsdtsExceptionHandler]
public class ProgramController : ApiController
{
/// <summary>
Expand Down Expand Up @@ -78,7 +79,14 @@ public IHttpActionResult GetProgram(int id)
[FsdtsExceptionHandler]
public IQueryable<Program> GetProgramsByOrgId(int Oid)
{
return db.Program.Where(pr => pr.OrganizationId == Oid).OrderBy(pr => pr.ProgramName).AsQueryable();
if (Oid != null)
{
return db.Program.Where(pr => pr.OrganizationId == Oid).OrderBy(pr => pr.ProgramName).AsQueryable();
}
else
{
throw new NullReferenceException("Organization ID you have entered is not correct.");
}
}

/// <summary>
Expand Down
1 change: 1 addition & 0 deletions FSDTS/Controllers/ProjectController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace FSDTS.Controllers
/// ProjectController class.
/// For CRUD operation related to Project.
/// </summary>
[FsdtsExceptionHandler]
public class ProjectController : ApiController
{
/// <summary>
Expand Down
1 change: 1 addition & 0 deletions FSDTS/Controllers/ProjectOrganizationController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace FSDTS.Controllers
using FSDTS.Models;
using log4net;

[FsdtsExceptionHandler]
public class ProjectOrganizationController : ApiController
{
SqlConnection con = null;
Expand Down
Loading

0 comments on commit f9ab984

Please sign in to comment.