New version of services

src/main/java/tk/artikus/assets/services/AssetFromAngular.java

@@ -6,16 +6,6 @@ import tk.artikus.assets.AssetLife;
 import tk.artikus.assets.AssetLifeChange;
 import tk.artikus.assets.tools.YearMonth;
 
-class Convert{
-	static long txtToLong( String value ) {
-		value = value.replace( ",", "" );
-		float fInitial = Float.parseFloat( value );
-		long lValue = (long) (fInitial * 100);
-		return lValue;
-	}	
-}
-
-
 
 record YearMonthFromAngular(int year, int month) {
 	YearMonth toYearMonth() {
@@ -23,6 +13,21 @@ record YearMonthFromAngular(int year, int month) {
 	}
 }
 
+record AssetDepreciationMethodFromAngular( String year, AssetDepreciationMethod.Type type,  String factor, String rate ) {
+	AssetDepreciationMethod toAssetDepreciationMethod(){
+		return AssetDepreciationMethod.builder()
+				.type( type )
+				.factor( 0, Convert.txtToLong( factor ) )
+				.rate(   0, Convert.txtToLong( rate ) )
+				.build();
+	}
+	
+	int getYear() {
+		return (int)Convert.txtToInt( year );
+	}
+	
+}
+
 record AssetLifeChangeFromAngular(YearMonthFromAngular when, String initial, String residual, String depreciation) {
 	AssetLifeChange toAssetLifeChange( boolean isFirst ) {
 		
@@ -38,12 +43,23 @@ record AssetLifeChangeFromAngular(YearMonthFromAngular when, String initial, Str
 	}
 }
 
+class Convert{
+	static long txtToLong( String value ) {
+		value = value.replace( ",", "" );
+		float fInitial = Float.parseFloat( value );
+		long lValue = (long) (fInitial * 100);
+		return lValue;
+	}	
+	static int txtToInt( String value ) {
+		return Integer.valueOf( value );
+	}	
+}
+
+
 public record AssetFromAngular(
 		YearMonthFromAngular start, 
-		String depreciationRate, 
+		AssetLifeChangeFromAngular[] life,
-		AssetDepreciationMethod.Type type,
+		AssetDepreciationMethodFromAngular[] depreciationMethods) {
-		String factorValue, 	
-		AssetLifeChangeFromAngular[] life) {
 	
 	Asset toAsset() {
 
@@ -52,13 +68,11 @@ public record AssetFromAngular(
 
 		YearMonth start = this.start.toYearMonth();
 		asset.setStartOfDepreciation( start );
-
+		
-		long lDepreciation = Convert.txtToLong( depreciationRate );
+		for( AssetDepreciationMethodFromAngular depreciationMethodFromAngular : depreciationMethods ) {
-		long lFactor = Convert.txtToLong( factorValue );
+			asset.setFromYearDepreciationMethod(depreciationMethodFromAngular.getYear(), 
-		AssetDepreciationMethod assetDepreciationMethod = AssetDepreciationMethod.builder().type( type )
+												depreciationMethodFromAngular.toAssetDepreciationMethod() );
-				.factor( 0, lFactor ).rate( 0, lDepreciation ).build();
+		}
-
-		asset.setFromYearDepreciationMethod( start.getYear(), assetDepreciationMethod );
 
 
 		AssetLife assetLife = new AssetLife();

src/main/java/tk/artikus/assets/services/AssetService.java

@@ -2,7 +2,6 @@ package tk.artikus.assets.services;
 
 import java.util.Collection;
 
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;