Develop (#17)

ShadyDL · EGKangaroo · Gompel,Sverre S. van · web-flow · commit c9e2ac4fbade · 2021-04-16T10:22:41.000+02:00
* Task/#257 controller skeleton * Task/#263 koppeling pakket service * cors (#5) * dockerfile added local file * Add license (#6) * Update README.md * Create LICENSE * Update README.md Co-authored-by: Heesakkers,Aron A.P.H.M <aron.heesakkers@student.fontys.nl> * Build (#11) Co-authored-by: Aron Heesakkers <aron.heesakkers@via.nl> * Hardcoded values to appsettings (#12) Co-authored-by: Aron Heesakkers <aron.heesakkers@via.nl> * Update README.md (#13) * Develop (#7) * Task/#257 controller skeleton * Task/#263 koppeling pakket service * cors (#5) * dockerfile added local file * Add license (#6) * Update README.md * Create LICENSE * Update README.md Co-authored-by: Heesakkers,Aron A.P.H.M <aron.heesakkers@student.fontys.nl> Co-authored-by: Wieling,Kevin C.F.J <k.wieling@student.fontys.nl> Co-authored-by: Gompel,Sverre S. van <sverre.vangompel@student.fontys.nl> Co-authored-by: Heesakkers,Aron A.P.H.M <aron.heesakkers@student.fontys.nl> Co-authored-by: EGKangaroo <EGKangaroo@yahoo.com> * Update README.md Co-authored-by: Wieling,Kevin C.F.J <k.wieling@student.fontys.nl> Co-authored-by: Gompel,Sverre S. van <sverre.vangompel@student.fontys.nl> Co-authored-by: Heesakkers,Aron A.P.H.M <aron.heesakkers@student.fontys.nl> Co-authored-by: EGKangaroo <EGKangaroo@yahoo.com> * Update README.md * Gateway fix (#16) * Changes * gateway fix, same request model as package service * created at action bug fixed Co-authored-by: Aron Heesakkers <aron.heesakkers@via.nl> Co-authored-by: EGKangaroo <EGKangaroo@yahoo.com> Co-authored-by: Wieling,Kevin C.F.J <k.wieling@student.fontys.nl> Co-authored-by: Gompel,Sverre S. van <sverre.vangompel@student.fontys.nl> Co-authored-by: Heesakkers,Aron A.P.H.M <aron.heesakkers@student.fontys.nl> Co-authored-by: EGKangaroo <EGKangaroo@yahoo.com> Co-authored-by: Aron Heesakkers <aron.heesakkers@via.nl>
diff --git a/Controllers/PackageController.cs b/Controllers/PackageController.cs
@@ -126,7 +126,7 @@ public async Task<ActionResult<PackageResponseModel>> Post(PackageRequestModel r
             {
                 PackageServiceModel model = await response.GetJsonAsync<PackageServiceModel>();
                 PackageResponseModel responseModel = ServiceToResponseModelConverter.ConvertPackage(model);
-                return CreatedAtAction("GetPackage", new { id = model.Id }, responseModel);
+                return CreatedAtAction("Post", responseModel);
             }
         }
 
diff --git a/Models/RequestModels/PackageRequestModel.cs b/Models/RequestModels/PackageRequestModel.cs
@@ -7,10 +7,9 @@ namespace api_gateway.Models.RequestModels
 {
     public class PackageRequestModel
     {
-        public int ReceiverId { get; set; }
-        public int CollectionPointId { get; set; }
-        public int TrackAndTraceId { get; set; }
         public string Sender { get; set; }
+        public string ReceiverId { get; set; }
         public string Name { get; set; }
+        public string CollectionPointId { get; set; }
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
     pkg:
         build:
             context: .
-            dockerfile: Dockerfile
+            dockerfile: Dockerfile.local
         container_name: gateway
         ports:
             - "0.0.0.0:8123:8123"

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public async Task<ActionResult<PackageResponseModel>> Post(PackageRequestModel r`
`126`	`126`	`{`
`127`	`127`	`PackageServiceModel model = await response.GetJsonAsync<PackageServiceModel>();`
`128`	`128`	`PackageResponseModel responseModel = ServiceToResponseModelConverter.ConvertPackage(model);`
`129`		`- return CreatedAtAction("GetPackage", new { id = model.Id }, responseModel);`
	`129`	`+ return CreatedAtAction("Post", responseModel);`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,9 @@ namespace api_gateway.Models.RequestModels`
`7`	`7`	`{`
`8`	`8`	`public class PackageRequestModel`
`9`	`9`	`{`
`10`		`- public int ReceiverId { get; set; }`
`11`		`- public int CollectionPointId { get; set; }`
`12`		`- public int TrackAndTraceId { get; set; }`
`13`	`10`	`public string Sender { get; set; }`
	`11`	`+ public string ReceiverId { get; set; }`
`14`	`12`	`public string Name { get; set; }`
	`13`	`+ public string CollectionPointId { get; set; }`
`15`	`14`	`}`
`16`	`15`	`}`