'#TDP - IW

Fixed bug with work DB
Added unit-test work with DB and files together

Author: StrongerProgrammer7

IndividualWork/Unit_tests/tests_db/test_auto.rb

@@ -1,37 +1,47 @@
-require_relative File.dirname($0) + '/../../model_person/list_file/owner_list.rb'
-require_relative File.dirname($0) + '/../../model_person/datatable/owners_list.rb'
+require_relative File.dirname($0) + '/../../model_auto/list_file/auto_list_json.rb'
+require_relative File.dirname($0) + '/../../model_auto/datatable/auto_list.rb'
 require_relative File.dirname($0) + '/../../model_entity/entity_list/Parking_list.rb'
 require 'test/unit'
 
-class TestOwner_db < Test::Unit::TestCase
+class TestAuto_db < Test::Unit::TestCase
 
   def setup
-	  @owner = Parking_list.intialize_DB(:owner)
+	  @auto = Parking_list.intialize_DB(:auto)
   end
 
-  def test_initialize_owner
-	elem = @owner.get_element_by_id(1)
-    assert_equal("Яковлев", elem["surname"])
-    assert_equal("Леон", elem["name"])
-    assert_equal("Тимофеевич", elem["lastname"])
-    assert_equal("89374225252", elem["phone"])
-    assert_equal(nil,elem["mail"])
+  def test_initialize
+	elem = @auto.get_element_by_id(1)
+    assert_equal(1, elem["owner_id"])
+    assert_equal("Higlander", elem["model"])
+    assert_equal("black", elem["color"])
   end
 
   def test_get_k_n
-	data_list_person_short = @owner.get_k_n_elements_list(1,3,data_list:nil)
+	data_list_person_short = @auto.get_k_n_elements_list(1,3,data_list:nil)
 	table = data_list_person_short.getDataFromTable()
-	initials = table.get_element(0,1)
-	intitlas_man = table.get_element(1,1)
-	not_mail = table.get_element(1,3)
-	assert_equal("initials", initials)
-	assert_equal("Яковлев Л.Т.", intitlas_man)
-	assert_equal("not mail", not_mail)
+	model = table.get_element(0,1)
+	highlander = table.get_element(1,1)
+	color = table.get_element(1,2)
+	assert_equal("model", model)
+	assert_equal("Higlander", highlander)
+	assert_equal("black", color)
   end
 
   def test_get_elements_count
-	 len = @owner.get_elements_count()
+	 len = @auto.get_elements_count()
 	 assert_equal(3, len)
   end
+  
+  def test_after_db_files_json
+	@auto.strategy = Entity_adapter.new(Auto_list_json.new(),:auto)
+	data_list_auto = @auto.get_k_n_elements_list(1,2,data_list:nil)
+	table = data_list_auto.getDataFromTable()
+	model = table.get_element(0,1)
+	model_name = table.get_element(1,1)
+	id_owner = table.get_element(1,0)
+	assert_equal("model", model)
+	assert_equal("X6", model_name)
+	assert_equal(1, id_owner)
+  end
 
 end

IndividualWork/model_auto/auto_DB/auto_list_DB.rb

@@ -19,10 +19,9 @@ def get_k_n_elements_list(k,n,data_list:nil)
 
 		list_auto = []
 		@dbcon.crud_by_db("Select * FROM Auto LIMIT #{limit} OFFSET #{offset};").to_a.each do |elem|
-			elem = clearData(elem)
 			auto = Auto.new(
 					id:elem["id"],
-					id_owner:elem["id_owner"],
+					id_owner:Integer(elem["owner_id"]),
       				model:elem["model"],
       				color:elem["color"])
 			list_auto.push(auto)
@@ -38,14 +37,14 @@ def get_k_n_elements_list(k,n,data_list:nil)
 	def push_element(element)
 		auto = create_auto(element:element,id:0)
 		@dbcon.crud_by_db("INSERT INTO Auto
-			(id_owner,name, model, color) 
+			(owner_id,name, model, color) 
 			VALUES 
 			('#{auto.id_owner}','#{auto.model}','#{auto.color}');")
 	end
 
 	def replace_element_by_id(id,element)
 		auto = create_auto(element:element,id:id)
-		@dbcon.crud_by_db("UPDATE Auto SET id_owner = '#{auto.id_owner}', model = '#{auto.model}',color = '#{auto.color}'
+		@dbcon.crud_by_db("UPDATE Auto SET owner_id = '#{auto.id_owner}', model = '#{auto.model}',color = '#{auto.color}'
 		WHERE id = #{id};")
 	end
 
@@ -60,7 +59,7 @@ def get_elements_count()
 	private 
 	def create_auto(element:,id:nil)
 		 Auto.new(id:id,
-					id_owner:element["id_owner"],
+					id_owner:Integer(element["owner_id"]),
       				model:element["model"],
       				color:element["color"])
 	end

IndividualWork/model_entity/entity_list/Parking_list.rb

@@ -1,6 +1,7 @@
 require_relative '../../model_person/person_DB/owners_list_DB.rb'
 require_relative '../../model_person/person_DB/guards_list_DB.rb'
-#require_relative '../../model_lab/lab_DB/labs_list_DB.rb'
+require_relative '../../model_auto/auto_DB/auto_list_DB.rb'
+
 require_relative File.dirname($0) + '/entity_adapter.rb'
 
 class Parking_list
@@ -24,6 +25,8 @@ def self.intialize_DB(entity)
   				Parking_list.new(Owners_list_DB.new())
   			when :guard
   				Parking_list.new(Guards_list_DB.new())
+			when :auto
+  				Parking_list.new(Auto_list_DB.new())
   			else
   				raise ArgumentError, "Invalid argument #{entity}"
   		end		

IndividualWork/model_entity/entity_list/entity_adapter.rb

@@ -1,6 +1,7 @@
 #require_relative '../../model_lab/datatable/labs_list.rb'
 require_relative '../../model_person/datatable/owners_list.rb'
 require_relative '../../model_person/datatable/guards_list.rb'
+require_relative '../../model_auto/datatable/auto_list.rb'
 
 class Entity_adapter
 
@@ -17,6 +18,9 @@ def initialize(format_file,entity)
   			when :guard
   				self.addressFile ="/../../testfile/testfile_guards/"
   				@entity_list_file = Guards_list.new(format_file)
+			when :auto
+  				self.addressFile ="/../../testfile/testfile_auto/"
+  				@entity_list_file = Auto_list.new(format_file)
   			else
   				raise ArgumentError, "Invalid argument #{entity}"
   		end