'#TPD - IW

FIxed bug with files
Added unit-test for files

Author: StrongerProgrammer7

IndividualWork/DIAGRAM/Diagram.mdj

@@ -0,0 +1,37 @@
+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_entity/entity_list/Parking_list.rb'
+require 'test/unit'
+
+class TestOwner_db < Test::Unit::TestCase
+  
+  def setup
+	  @owner = Parking_list.intialize_DB(:owner)
+  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"])
+  end
+  
+  def test_get_k_n
+	data_list_person_short = @owner.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)
+  end
+  
+  def test_get_elements_count
+	 len = @owner.get_elements_count()
+	 assert_equal(3, len)
+  end
+
+end

IndividualWork/Unit_tests/tests_db/test_auto.rb

@@ -0,0 +1,61 @@
+require_relative File.dirname($0) + '/../../model_auto/auto.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 'test/unit'
+
+class TestAuto_json < Test::Unit::TestCase
+  
+  def setup
+	  @auto_file = Auto_list.new(Auto_list_json.new())
+  end
+
+  def test_initialize_owner
+	elem = @auto_file.get_element_by_id(1)
+    assert_equal(1, elem.id_owner)
+    assert_equal("X6", elem.model)
+    assert_equal("black", elem.color)
+  end
+ 
+
+  def test_get_k_n
+	data_list_auto = @auto_file.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
+ 
+  def test_get_elements_count
+	 len = @auto_file.get_elements_count()
+	 assert_equal(2, len)
+  end
+
+  def test_write_files
+	elements = [
+	  Auto.new(id:1,
+      id_owner:1,
+      model:"X6",
+	  color:"black"),
+	  Auto.new(id:2,
+      id_owner:2,
+      model:"Highlander",
+	  color:"gray"),
+	  Auto.new(id:3,
+      id_owner:3,
+      model:"Skoda",
+	  color:"black")]
+	  
+	  @auto_file.write_to_file("/../../testfile/testfile_auto/","test",elements)
+      
+		data_list_auto = @auto_file.get_k_n_elements_list(1,3,data_list:nil)
+		table = data_list_auto.getDataFromTable()
+		assert_equal(3,  table.get_element(3,0))
+		assert_equal("Skoda", table.get_element(3,1))
+	
+  end
+
+end

IndividualWork/Unit_tests/tests_files/test_auto_json.rb

@@ -0,0 +1,68 @@
+require_relative File.dirname($0) + './auto.rb'
+require_relative '../../model_entity/entity_DB/entity_list_DB.rb'
+require 'date'
+
+class Auto_list_DB < Entities_list_DB
+
+	def initialize()
+		super()
+	end 
+	
+	def get_element_by_id(id)
+		auto = @dbcon.crud_by_db("Select * FROM Auto WHERE id = #{id}").to_a
+		auto[0]
+	end
+
+	def get_k_n_elements_list(k,n,data_list:nil)
+		offset = (k - 1) * n
+		limit = n
+
+		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"],
+      				model:elem["model"],
+      				color:elem["color"])
+			list_auto.push(auto)
+		end
+
+		if(data_list == nil) then
+			return Data_list_auto.new(list_auto)
+		else
+			return data_list.list_entities = list_auto
+		end
+	end
+
+	def push_element(element)
+		auto = create_auto(element:element,id:0)
+		@dbcon.crud_by_db("INSERT INTO Auto
+			(id_owner,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}'
+		WHERE id = #{id};")
+	end
+
+	def delete_element_by_id(id)
+		@dbcon.crud_by_db("Delete from Auto WHERE id = #{id}")
+	end
+
+	def get_elements_count()
+		return @dbcon.crud_by_db("Select count(*) FROM Auto").to_a[0]['count(*)']
+	end
+	
+	private 
+	def create_auto(element:,id:nil)
+		 Auto.new(id:id,
+					id_owner:element["id_owner"],
+      				model:element["model"],
+      				color:element["color"])
+	end
+
+end

IndividualWork/model_auto/auto_DB/auto_list_DB.rb

@@ -8,12 +8,12 @@ class Auto_list_json < Entities_list_from_file
 	#--------------------Test dev - Labs ------------------------
 	attr_accessor :addressFile
 	def initialize()
-		self.addressFile = "./testfile/testfile_auto/test.json"
+		self.addressFile = "testfile/testfile_auto/test.json"
 	end
 	#----------------------------------------------------
 
 	def read_from_file(addressFile)
-		addressFile = self.addressFile if (addressFile == nil)
+		addressFile = File.dirname($0) + "/../../#{self.addressFile}" if addressFile==nil
 		raise "Address file don't correct, check this." if(!File.exist?(addressFile))
 		autos = Array.new()
 		file = File.read addressFile

IndividualWork/model_auto/lab_DB/labs_list_DB.rb

@@ -5,11 +5,11 @@ class Auto_list_txt < Entities_list_from_file
 	#--------------------Test dev - autos ------------------------
 	attr_accessor :addressFile
 	def initialize()
-		self.addressFile = "./testfile/testfile_auto/test.txt"
+		self.addressFile = "testfile/testfile_auto/test.txt"
 	end
 	#----------------------------------------------------
 	def read_from_file(addressFile)
-		addressFile = self.addressFile if (addressFile == nil)
+		addressFile = File.dirname($0) + "/../../#{self.addressFile}" if addressFile==nil
 		raise "Address file don't correct, check this." if(!File.exist?(addressFile))
 		autos = Array.new()
 		File.open(addressFile,'r') do |file|

IndividualWork/model_auto/list_file/auto_list_json.rb

@@ -8,12 +8,12 @@ class Auto_list_yaml < Entities_list_from_file
 	#--------------------Test dev - autos ------------------------
 	attr_accessor :addressFile
 	def initialize()
-		self.addressFile =  "./testfile/testfile_auto/test.yaml"
+		self.addressFile =  "testfile/testfile_auto/test.yaml"
 	end
 	#----------------------------------------------------
 
 	def read_from_file(addressFile)
-		addressFile = self.addressFile if (addressFile == nil)
+		addressFile = File.dirname($0) + "/../../#{self.addressFile}" if addressFile==nil
 		raise "Address file don't correct, check this." if(!File.exist?(addressFile))
 
 		autos = Array.new()

IndividualWork/model_auto/list_file/auto_list_txt.rb

@@ -0,0 +1,20 @@
+{
+  "auto1": {
+    "id": 1,
+    "id_owner": 1,
+    "model": "X6",
+    "color": "black"
+  },
+  "auto2": {
+    "id": 2,
+    "id_owner": 2,
+    "model": "Highlander",
+    "color": "gray"
+  },
+  "auto3": {
+    "id": 3,
+    "id_owner": 3,
+    "model": "Skoda",
+    "color": "black"
+  }
+}

IndividualWork/model_auto/list_file/auto_list_yaml.rb

@@ -0,0 +1,2 @@
+1,1 ,X6 ,black
+2,2 ,Higlander ,gray