Skip to content

Commit

Permalink
Merge pull request #10 from stdevRulo/m.tenorio
Browse files Browse the repository at this point in the history
M.tenorio
  • Loading branch information
e1Ru1o authored May 21, 2019
2 parents 3b90bfe + 4d54711 commit 56e291c
Show file tree
Hide file tree
Showing 12 changed files with 83 additions and 78 deletions.
1 change: 0 additions & 1 deletion BizData/Entities/Viaje.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ public class Viaje
public virtual Pais Pais { get; set; }
public virtual Ciudad Ciudad { get; set; }
public virtual Institucion Institucion { get; set; }
public virtual Itinerario Itinerario { get; set; }
}
}
15 changes: 4 additions & 11 deletions BizDbAccess/Repositories/HistorialDbAccess.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,13 @@ public void Delete(Historial entity)

public Historial Update(Historial entity, Historial toUpd)
{
if (toUpd == null)
throw new Exception("Historial to be updated no exist");

toUpd.EstadoViaje = entity.EstadoViaje ?? toUpd.EstadoViaje;
toUpd.Viaje = entity.Viaje ?? toUpd.Viaje;

_context.Historial.Update(toUpd);
return toUpd;
throw new NotImplementedException();
}

public Historial GetHistorial(string estadoViaje, Itinerario viaje)
public Historial GetHistorial(Estado estadoViaje, Itinerario viaje)
{
return _context.Historial.Where(h => h.EstadoViaje == estadoViaje &&
h.Viaje.Usuario.Id == viaje.Usuario.Id)
return _context.Historial.Where(h => h.Estado == estadoViaje &&
h.Itinerario.Usuario.Id == viaje.Usuario.Id)
.SingleOrDefault();
}
}
Expand Down
1 change: 0 additions & 1 deletion BizDbAccess/Repositories/ViajeDbAccess.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public Viaje Update(Viaje entity, Viaje toUpd)
toUpd.FechaInicio = entity.FechaInicio ?? toUpd.FechaFin;
toUpd.MotivoViaje = entity.MotivoViaje ?? toUpd.MotivoViaje;
toUpd.Pais = entity.Pais ?? toUpd.Pais;
toUpd.Usuario = entity.Usuario ?? toUpd.Usuario;
toUpd.Ciudad = entity.Ciudad ?? toUpd.Ciudad;

_context.Viajes.Update(toUpd);
Expand Down
2 changes: 1 addition & 1 deletion BizLogic/Workflow/Concrete/RegisterHistorialAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public Historial Action(Historial dto)
{
try
{
var result = _dbAccess.GetHistorial(dto.EstadoViaje, dto.Viaje);
var result = _dbAccess.GetHistorial(dto.Estado, dto.Itinerario);

if (result != null)
throw new InvalidOperationException();
Expand Down
7 changes: 2 additions & 5 deletions BizLogic/Workflow/ViajeCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,14 @@ public class ViajeCommand
public DateTime? FechaInicio { get; set; }
public DateTime? FechaFin { get; set; }

public Usuario Usuario { get; set; }
public Pais Pais { get; set; }
public Ciudad Ciudad { get; set; }
//public Institucion Institucion { get; set; }
public Itinerario Itinerario { get; set; }

public ViajeCommand(int itinerarioID, string usuarioID, string paisName, string motivo, DateTime? fechaInicio, DateTime? fechaFin)
public ViajeCommand(int itinerarioID, string paisName, string motivo, DateTime? fechaInicio, DateTime? fechaFin)
{
ItinerarioID = itinerarioID;
UsuarioId = usuarioID;
FechaInicio = fechaInicio;
FechaFin = fechaFin;
PaisName = paisName;
Expand All @@ -35,9 +33,8 @@ public Viaje ToViaje()
return new Viaje()
{
MotivoViaje = Motivo,
Usuario = Usuario,
Pais = Pais,
Ciudad = Ciudad
//Ciudad = Ciudad
// Institucion = Institucion
};
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace DataLayer.Migrations
{
public partial class FinalSprint200 : Migration
public partial class FinalSprint210 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
Expand Down Expand Up @@ -190,8 +190,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
{
ItinerarioID = table.Column<int>(nullable: false)
.Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
status = table.Column<string>(nullable: true),
FechaInicio = table.Column<DateTime>(nullable: true),
FechaFin = table.Column<DateTime>(nullable: true),
Estado = table.Column<int>(nullable: false),
UsuarioId = table.Column<string>(nullable: false)
},
constraints: table =>
Expand Down Expand Up @@ -258,18 +260,27 @@ protected override void Up(MigrationBuilder migrationBuilder)
{
HistorialID = table.Column<int>(nullable: false)
.Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
EstadoViaje = table.Column<string>(nullable: true),
ViajeItinerarioID = table.Column<int>(nullable: true)
Comentario = table.Column<string>(nullable: true),
Estado = table.Column<int>(nullable: false),
Fecha = table.Column<DateTime>(nullable: false),
UsuarioId = table.Column<string>(nullable: true),
ItinerarioID = table.Column<int>(nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Historial", x => x.HistorialID);
table.ForeignKey(
name: "FK_Historial_Itinerarios_ViajeItinerarioID",
column: x => x.ViajeItinerarioID,
name: "FK_Historial_Itinerarios_ItinerarioID",
column: x => x.ItinerarioID,
principalTable: "Itinerarios",
principalColumn: "ItinerarioID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_Historial_AspNetUsers_UsuarioId",
column: x => x.UsuarioId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
});

migrationBuilder.CreateTable(
Expand Down Expand Up @@ -353,11 +364,10 @@ protected override void Up(MigrationBuilder migrationBuilder)
MotivoViaje = table.Column<string>(nullable: true),
FechaInicio = table.Column<DateTime>(nullable: true),
FechaFin = table.Column<DateTime>(nullable: true),
UsuarioId = table.Column<string>(nullable: true),
ItinerarioID = table.Column<int>(nullable: true),
PaisID = table.Column<int>(nullable: true),
CiudadID = table.Column<int>(nullable: true),
InstitucionID = table.Column<int>(nullable: true),
ItinerarioID = table.Column<int>(nullable: true)
InstitucionID = table.Column<int>(nullable: true)
},
constraints: table =>
{
Expand Down Expand Up @@ -386,12 +396,6 @@ protected override void Up(MigrationBuilder migrationBuilder)
principalTable: "Paises",
principalColumn: "PaisID",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_Viajes_AspNetUsers_UsuarioId",
column: x => x.UsuarioId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
});

migrationBuilder.CreateIndex(
Expand Down Expand Up @@ -439,9 +443,14 @@ protected override void Up(MigrationBuilder migrationBuilder)
column: "PaisID");

migrationBuilder.CreateIndex(
name: "IX_Historial_ViajeItinerarioID",
name: "IX_Historial_ItinerarioID",
table: "Historial",
column: "ItinerarioID");

migrationBuilder.CreateIndex(
name: "IX_Historial_UsuarioId",
table: "Historial",
column: "ViajeItinerarioID");
column: "UsuarioId");

migrationBuilder.CreateIndex(
name: "IX_Itinerarios_UsuarioId",
Expand Down Expand Up @@ -493,11 +502,6 @@ protected override void Up(MigrationBuilder migrationBuilder)
table: "Viajes",
column: "PaisID");

migrationBuilder.CreateIndex(
name: "IX_Viajes_UsuarioId",
table: "Viajes",
column: "UsuarioId");

migrationBuilder.CreateIndex(
name: "IX_Visas_RegionID",
table: "Visas",
Expand Down
34 changes: 21 additions & 13 deletions DataLayer/Migrations/EfCoreContextModelSnapshot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,21 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.ValueGeneratedOnAdd()
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);

b.Property<string>("EstadoViaje");
b.Property<string>("Comentario");

b.Property<int?>("ViajeItinerarioID");
b.Property<int>("Estado");

b.Property<DateTime>("Fecha");

b.Property<int?>("ItinerarioID");

b.Property<string>("UsuarioId");

b.HasKey("HistorialID");

b.HasIndex("ViajeItinerarioID");
b.HasIndex("ItinerarioID");

b.HasIndex("UsuarioId");

b.ToTable("Historial");
});
Expand All @@ -72,13 +80,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.ValueGeneratedOnAdd()
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);

b.Property<int>("Estado");

b.Property<DateTime?>("FechaFin");

b.Property<DateTime?>("FechaInicio");

b.Property<string>("UsuarioId")
.IsRequired();

b.Property<string>("status");

b.HasKey("ItinerarioID");

b.HasIndex("UsuarioId");
Expand Down Expand Up @@ -235,8 +247,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Property<int?>("PaisID");

b.Property<string>("UsuarioId");

b.HasKey("ViajeID");

b.HasIndex("CiudadID");
Expand All @@ -247,8 +257,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.HasIndex("PaisID");

b.HasIndex("UsuarioId");

b.ToTable("Viajes");
});

Expand Down Expand Up @@ -392,9 +400,13 @@ protected override void BuildModel(ModelBuilder modelBuilder)

modelBuilder.Entity("BizData.Entities.Historial", b =>
{
b.HasOne("BizData.Entities.Itinerario", "Viaje")
b.HasOne("BizData.Entities.Itinerario", "Itinerario")
.WithMany()
.HasForeignKey("ItinerarioID");

b.HasOne("BizData.Entities.Usuario", "Usuario")
.WithMany()
.HasForeignKey("ViajeItinerarioID");
.HasForeignKey("UsuarioId");
});

modelBuilder.Entity("BizData.Entities.Itinerario", b =>
Expand Down Expand Up @@ -453,10 +465,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.HasOne("BizData.Entities.Pais", "Pais")
.WithMany()
.HasForeignKey("PaisID");

b.HasOne("BizData.Entities.Usuario", "Usuario")
.WithMany()
.HasForeignKey("UsuarioId");
});

modelBuilder.Entity("BizData.Entities.Visa", b =>
Expand Down
3 changes: 1 addition & 2 deletions ServiceLayer/WorkFlowServices/WorkflowServices.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@ public void Removeitinerario(Itinerario entity)
_context.Commit();
}

public async Task<long> RegisterViajeAsync(ViajeCommand cmd)
public long RegisterViajeAsync(ViajeCommand cmd)
{
cmd.Usuario = await _userManager.FindByIdAsync(cmd.UsuarioId);
//cmd.Ciudad = _ciudadDbAccess.GetCiudad(cmd.CiudadName);
//cmd.Institucion = _institucionDbAccess.GetInstitucion(cmd.InstitucionName);
cmd.Pais = _paisDbAccess.GetPais(cmd.PaisName);
Expand Down
4 changes: 2 additions & 2 deletions TripManager2.0/Controllers/UserController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ public async Task<IActionResult> Create(ViajeViewModel vm)

for (int i = 0; i < vm.Country.Count(); i++)
{
var viajeCmd = new ViajeCommand(iterID, iterCmd.UsuarioID, vm.Country[i], vm.Motivo[i], vm.Start[i], vm.End[i]);
await services.RegisterViajeAsync(viajeCmd);
var viajeCmd = new ViajeCommand(iterID, vm.Country[i], vm.Motivo[i], vm.Start[i], vm.End[i]);
services.RegisterViajeAsync(viajeCmd);
}

return View("Welcome");
Expand Down
Loading

0 comments on commit 56e291c

Please sign in to comment.