implemented address update method and implemented shipping price with…

… chckout total price

Camekan.API/Controllers/AccountController.cs

@@ -17,17 +17,14 @@ public class AccountController : BaseApiController
         private readonly UserManager<AppUser> _userManager;
         private readonly SignInManager<AppUser> _signInManager;
         private readonly ITokenService _tokenService;
-        private readonly IAddressRepository _addressRepository;
         private readonly IMapper _mapper;
         public AccountController(UserManager<AppUser> userManager, 
                                  SignInManager<AppUser> signInManager,
-                                 IAddressRepository addressRepository,
                                  ITokenService tokenService, IMapper mapper)
         {
             _userManager = userManager;
             _signInManager = signInManager;
             _tokenService = tokenService;
-            _addressRepository = addressRepository;
             _mapper = mapper;
         }
 
@@ -36,6 +33,7 @@ public AccountController(UserManager<AppUser> userManager,
         public async Task<ActionResult<AppUserDto>> GetCurrentUser()
         {
             var user = await _userManager.FindByEmailFromClaimsPrincipalAsync(HttpContext.User);
+            if (user == null) return Ok(new AppUserDto());
             return Ok(new AppUserDto
             {
                 Email = user.Email,

Camekan.API/Extensions/UserManagerExtension.cs

@@ -14,8 +14,8 @@ public static async Task<AppUser> FindUserByClaimsPrincipleWithAddressAsync(this
         {
             var email = user.Claims?.FirstOrDefault(x => x.Type == ClaimTypes.Email)?.Value;
             // join dene
-
-            return await input.Users.Include(a=>a.Id).Include(a=>a.Address).SingleOrDefaultAsync(a => a.Email == email);
+           var appUser= await input.Users.Include(a => a.Address).FirstOrDefaultAsync(a => a.Email == email);
+            return appUser;
         }
         public static async Task<AppUser> FindByEmailFromClaimsPrincipalAsync(this UserManager<AppUser> input, ClaimsPrincipal user)
         {

Camekan.Client/src/app/basket/basket.service.ts

@@ -6,6 +6,7 @@ import { environment } from 'src/environments/environment';
 import { Basket, IBasket } from '../shared/models/basket.model';
 import { IBasketItem } from '../shared/models/basketItem.model';
 import { IBasketTotal } from '../shared/models/basketTotal.model';
+import { IDeliveryMethod } from '../shared/models/deliveryMethod.model';
 import { IProduct } from '../shared/models/product.model';
 
 @Injectable({
@@ -18,9 +19,13 @@ export class BasketService {
   private basketTotalSource = new BehaviorSubject<IBasketTotal>(null);
   basketTotal$ = this.basketTotalSource.asObservable();
   basket$ = this.basketSource.asObservable();
-
+  shippingPrice = 0;
   constructor(private http: HttpClient) { }
 
+  setShippingPrice(deliveryMethod: IDeliveryMethod): void {
+    this.shippingPrice = deliveryMethod.price;
+    this.calculateTotal();
+  }
   getBasket(id: string) {
     return this.http.get(this.baseUrl + '/basket?id=' + id)
       .pipe(
@@ -96,7 +101,7 @@ export class BasketService {
 
   private calculateTotal() {
     const basket = this.getCurrenctBasketValue();
-    const shipping = 0;
+    const shipping = this.shippingPrice;
     const subTotal = basket.items.reduce((a, b) => (b.price * b.quantity) + a, 0);
     const total = subTotal;
     this.basketTotalSource.next({ shipping, total, subTotal });

Camekan.Client/src/app/checkout/checkout-address/checkout-address.component.html

@@ -2,7 +2,8 @@
   <div class="d-flex justify-content-between align-content-center">
     <h4>Teslimat Adresi</h4>
     <button (click)="saveUserAddress()"
-    [disabled]="!checkoutForm.get('addressForm').valid || !checkoutForm.get('addressForm').dirty" class="btn btn-outline-success mb-3">Kaydet</button>
+    [disabled]="!checkoutForm.get('addressForm').valid || !checkoutForm.get('addressForm').dirty"
+    class="btn btn-outline-success mb-3">Kaydet</button>
   </div>
   <div class="row" formGroupName="addressForm">
       <div class="form-group col-6">

Camekan.Client/src/app/checkout/checkout-address/checkout-address.component.ts

@@ -17,7 +17,7 @@ export class CheckoutAddressComponent implements OnInit {
   saveUserAddress() {
     this.accountService.updateUserAddress(this.checkoutForm.get('addressForm').value)
       .subscribe(() => {
-        this.toastrService.success('adres kaydedildi.');
+        this.toastrService.success('Adres kaydedildi.');
       }, error => this.toastrService.error(error.message));
   }
 }

Camekan.Client/src/app/checkout/checkout-delivery/checkout-delivery.component.html

@@ -1,15 +1,16 @@
 <div class="mt-4" [formGroup]="checkoutForm">
-  <div class="row" formGroupName="deliveryForm">
+  <div class="row ml-5" formGroupName="deliveryForm">
     <div class="form-group col-6" *ngFor="let item of deliveryMethods">
       <input
         type="radio"
         id="{{ item.id }}"
         value="{{ item.id }}"
+        (click)="setShippingPrice(item)"
         formControlName="deliveryMethod"
-        class="custom-control-class"
+        class="custom-control-class mr-3"
       />
       <label for="{{ item.id }}" class="custom-control-class">
-        <strong>{{ item.shortName }} - {{ item.price | currency }}</strong>
+        <strong>{{ item.shortName }} - {{ item.price | currency: "TRY":"₺":"" }}</strong>
       </label>
       <br />
       <span class="label-description">

Camekan.Client/src/app/checkout/checkout-delivery/checkout-delivery.component.ts

@@ -1,5 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { FormGroup } from '@angular/forms';
+import { BasketService } from 'src/app/basket/basket.service';
 import { IDeliveryMethod } from 'src/app/shared/models/deliveryMethod.model';
 import { CheckoutService } from '../checkout.service';
 
@@ -11,11 +12,14 @@ import { CheckoutService } from '../checkout.service';
 export class CheckoutDeliveryComponent implements OnInit {
   @Input() checkoutForm: FormGroup;
   deliveryMethods: IDeliveryMethod[];
-  constructor(private checkOutService: CheckoutService) { }
+  constructor(private checkOutService: CheckoutService, private basketService: BasketService) { }
 
   ngOnInit(): void {
     this.getDeliveryMethods();
   }
+  setShippingPrice(deliveryMethod: IDeliveryMethod) {
+    this.basketService.setShippingPrice(deliveryMethod);
+  }
   getDeliveryMethods() {
     this.checkOutService.getDeliveryMethods()
       .subscribe((dm: IDeliveryMethod[]) => {

Camekan.DataAccess/Context/DatabaseContext.cs

@@ -43,10 +43,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.ApplyConfiguration(new OrderConfiguration());
             modelBuilder.ApplyConfiguration(new OrderItemConfiguration());
             modelBuilder.ApplyConfiguration(new ProductConfiguration());
-            //modelBuilder.ApplyConfiguration(new AppUserConfiguration());
-            //modelBuilder.ApplyConfiguration(new AddressConfiguration());
+            modelBuilder.ApplyConfiguration(new AppUserConfiguration());
+            modelBuilder.ApplyConfiguration(new AddressConfiguration());
+
 
-
             modelBuilder.ApplyConfigurationsFromAssembly(Assembly.GetExecutingAssembly());
         }
         public DbSet<AddressEntity> tAddress { get; set; }