Merge pull request #12 from spech66/copilot/remove-bmi-in-weight-inputs

Remove BMI from weight inputs - calculate from user settings

Author: spech66

LifelogBb/ApiDTOs/Weights/WeightInput.cs

@@ -1,16 +1,10 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace LifelogBb.ApiDTOs.Weights
 {
     public class WeightInput
     {
-        [Range(40, 220)] // 100 cm => 39,3701 inch...
-        public int Height { get; set; }
-
         [Range(40, 440)] // 200 Kg => 440 lbs...
         public double BodyWeight { get; set; }
-
-        public double Bmi => ((BodyWeight * 1.0) / (((Height * 0.01) * Height) * 0.01));
     }
 }

LifelogBb/ApiServices/WeightsService.cs

@@ -2,6 +2,8 @@
 using LifelogBb.ApiDTOs.Weights;
 using LifelogBb.Interfaces;
 using LifelogBb.Models.Entities;
+using LifelogBb.Utilities;
+using Microsoft.EntityFrameworkCore;
 
 namespace LifelogBb.ApiServices
 {
@@ -10,5 +12,38 @@ public class WeightsService : BaseCRUDService<Weight, WeightInput, WeightOutput>
         public WeightsService(IRepository<Weight> repository, IMapper mapper) : base(repository, mapper)
         {
         }
+
+        public override async Task<WeightOutput> Create(WeightInput inputModel)
+        {
+            var entry = _mapper.Map<Weight>(inputModel);
+            var config = Config.GetConfig(_repository.Context);
+            entry.Height = config.Height;
+            entry.Bmi = BmiHelper.Calculate(entry.BodyWeight, entry.Height, config.UnitsType);
+            entry.SetCreateFields();
+
+            _repository.Insert(entry);
+            await _repository.Context.SaveChangesAsync();
+
+            return _mapper.Map<WeightOutput>(entry);
+        }
+
+        public override async Task<WeightOutput> Update(long id, WeightInput inputModel)
+        {
+            var dbEntry = await _repository.Query.FirstOrDefaultAsync(m => m.Id == id);
+
+            if (dbEntry == null || id != dbEntry.Id)
+                throw new Exception("Invalid id");
+
+            dbEntry = _mapper.Map<WeightInput, Weight>(inputModel, dbEntry);
+            var config = Config.GetConfig(_repository.Context);
+            dbEntry.Height = config.Height;
+            dbEntry.Bmi = BmiHelper.Calculate(dbEntry.BodyWeight, dbEntry.Height, config.UnitsType);
+            dbEntry.SetUpdateFields();
+
+            _repository.Update(dbEntry);
+            await _repository.Context.SaveChangesAsync();
+            return _mapper.Map<WeightOutput>(dbEntry);
+        }
+
     }
 }

LifelogBb/Controllers/WeightsController.cs

@@ -119,9 +119,12 @@ public IActionResult Create()
             Weight? weight = _context.Weights.OrderByDescending(o => o.CreatedAt).FirstOrDefault();
             if(weight != null)
             {
-                weight.Id = 0;
+                var model = new EditWeightViewModel
+                {
+                    BodyWeight = weight.BodyWeight
+                };
                 ViewData["UnitsType"] = Config.GetConfig(_context).UnitsType;
-                return View(weight);
+                return View(model);
             }
 
             ViewData["UnitsType"] = Config.GetConfig(_context).UnitsType;
@@ -131,18 +134,24 @@ public IActionResult Create()
         // POST: Weights/Create
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Create([Bind("Height,BodyWeight")] Weight weight)
+        public async Task<IActionResult> Create([Bind("BodyWeight")] EditWeightViewModel weightViewModel)
         {
             if (ModelState.IsValid)
             {
-                CalculateBmi(weight);
+                var config = Config.GetConfig(_context);
+                var weight = new Weight
+                {
+                    BodyWeight = weightViewModel.BodyWeight,
+                    Height = config.Height
+                };
+                weight.Bmi = BmiHelper.Calculate(weight.BodyWeight, weight.Height, config.UnitsType);
                 weight.SetCreateFields();
                 _context.Add(weight);
                 await _context.SaveChangesAsync();
                 return RedirectToAction(nameof(Index));
             }
             ViewData["UnitsType"] = Config.GetConfig(_context).UnitsType;
-            return View(weight);
+            return View(weightViewModel);
         }
 
         // GET: Weights/Edit/5
@@ -166,7 +175,7 @@ public async Task<IActionResult> Edit(long? id)
         // POST: Weights/Edit/5
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Edit(long id, [Bind("Height,BodyWeight,Id")] EditWeightViewModel weightViewModel)
+        public async Task<IActionResult> Edit(long id, [Bind("BodyWeight,Id")] EditWeightViewModel weightViewModel)
         {
             if (id != weightViewModel.Id)
             {
@@ -179,7 +188,9 @@ public async Task<IActionResult> Edit(long id, [Bind("Height,BodyWeight,Id")] Ed
                 try
                 {
                     weightDb = _mapper.Map(weightViewModel, weightDb);
-                    CalculateBmi(weightDb);
+                    var config = Config.GetConfig(_context);
+                    weightDb.Height = config.Height;
+                    weightDb.Bmi = BmiHelper.Calculate(weightDb.BodyWeight, weightDb.Height, config.UnitsType);
                     weightDb.SetUpdateFields();
                     _context.Update(weightDb);
                     await _context.SaveChangesAsync();
@@ -243,17 +254,5 @@ private bool WeightExists(long id)
         {
           return _context.Weights.Any(e => e.Id == id);
         }
-
-        private void CalculateBmi(Weight weight)
-        {
-            var measurements = Config.GetConfig(_context).UnitsType;
-            if (measurements == Measurements.Metric)
-            {
-                weight.Bmi = (weight.BodyWeight * 1.0) / (((weight.Height * 0.01) * weight.Height) * 0.01);
-            } else
-            {
-                weight.Bmi = weight.BodyWeight / (weight.Height * weight.Height) * 703.0;
-            }
-        }
     }
 }