From b276b75b0f07d5bf0896cb75bcaba040e6db2e2e Mon Sep 17 00:00:00 2001
From: Nikitin Aleksandr <nikitinav@atomsbt.ru>
Date: Wed, 25 Oct 2023 14:59:28 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/templates/model/model.go_        | 44 ++++++++++++++--------------
 internal/create_files/model/model.go | 22 ++++++++++++++
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/bin/templates/model/model.go_ b/bin/templates/model/model.go_
index 0b201a2..74db479 100644
--- a/bin/templates/model/model.go_
+++ b/bin/templates/model/model.go_
@@ -29,7 +29,7 @@ type ICrud_LawsuitStatusType interface {
 }
 
 // TableName - возвращает имя таблицы в БД, нужен для gorm
-func (l LawsuitStatusType) TableNameDB() string {
+func (m LawsuitStatusType) TableNameDB() string {
 	return "lawsuit_status_types"
 }
 
@@ -49,8 +49,8 @@ func AsLawsuitStatusType(b []byte) (LawsuitStatusType, error) {
 }
 
 // LawsuitStatusTypeAsBytes - упаковывает объект в массив байтов
-func LawsuitStatusTypeAsBytes(l *LawsuitStatusType) ([]byte, error) {
-	b, err := msgpack.Marshal(l)
+func LawsuitStatusTypeAsBytes(m *LawsuitStatusType) ([]byte, error) {
+	b, err := msgpack.Marshal(m)
 	if err != nil {
 		return nil, err
 	}
@@ -58,32 +58,32 @@ func LawsuitStatusTypeAsBytes(l *LawsuitStatusType) ([]byte, error) {
 }
 
 // GetStructVersion - возвращает версию модели
-func (l LawsuitStatusType) GetStructVersion() uint32 {
+func (m LawsuitStatusType) GetStructVersion() uint32 {
 	if versionLawsuitStatusType == 0 {
-		versionLawsuitStatusType = CalcStructVersion(reflect.TypeOf(l))
+		versionLawsuitStatusType = CalcStructVersion(reflect.TypeOf(m))
 	}
 
 	return versionLawsuitStatusType
 }
 
 // GetModelFromJSON - создаёт модель из строки json
-func (l *LawsuitStatusType) GetModelFromJSON(sModel string) error {
+func (m *LawsuitStatusType) GetModelFromJSON(sModel string) error {
 	var err error
 
 	var bytes []byte
 	bytes = []byte(sModel)
 
-	err = json.Unmarshal(bytes, l)
+	err = json.Unmarshal(bytes, m)
 
 	return err
 }
 
 // GetJSON - возвращает строку json из модели
-func (l LawsuitStatusType) GetJSON() (string, error) {
+func (m LawsuitStatusType) GetJSON() (string, error) {
 	var ReturnVar string
 	var err error
 
-	bytes, err := json.Marshal(l)
+	bytes, err := json.Marshal(m)
 	if err != nil {
 		return ReturnVar, err
 	}
@@ -94,49 +94,49 @@ func (l LawsuitStatusType) GetJSON() (string, error) {
 //---------------------------- CRUD операции ------------------------------------------------------------
 
 // Read - находит запись в БД по ID, и заполняет в объект
-func (l *LawsuitStatusType) Read() error {
-	err := crud_LawsuitStatusType.Read(l)
+func (m *LawsuitStatusType) Read() error {
+	err := crud_LawsuitStatusType.Read(m)
 
 	return err
 }
 
 // Save - записывает объект в БД по ID
-func (l *LawsuitStatusType) Save() error {
-	err := crud_LawsuitStatusType.Save(l)
+func (m *LawsuitStatusType) Save() error {
+	err := crud_LawsuitStatusType.Save(m)
 
 	return err
 }
 
 // Update - обновляет объект в БД по ID
-func (l *LawsuitStatusType) Update() error {
-	err := crud_LawsuitStatusType.Update(l)
+func (m *LawsuitStatusType) Update() error {
+	err := crud_LawsuitStatusType.Update(m)
 
 	return err
 }
 
 // Create - создаёт объект в БД с новым ID
-func (l *LawsuitStatusType) Create() error {
-	err := crud_LawsuitStatusType.Create(l)
+func (m *LawsuitStatusType) Create() error {
+	err := crud_LawsuitStatusType.Create(m)
 
 	return err
 }
 
 // Delete - устанавливает признак пометки удаления в БД
-func (l *LawsuitStatusType) Delete() error {
-	err := crud_LawsuitStatusType.Delete(l)
+func (m *LawsuitStatusType) Delete() error {
+	err := crud_LawsuitStatusType.Delete(m)
 
 	return err
 }
 
 // Restore - снимает признак пометки удаления в БД
-func (l *LawsuitStatusType) Restore() error {
-	err := crud_LawsuitStatusType.Restore(l)
+func (m *LawsuitStatusType) Restore() error {
+	err := crud_LawsuitStatusType.Restore(m)
 
 	return err
 }
 
 // SetCrudInterface - заполняет интерфейс crud: DB, GRPC, NRPC
-func (l LawsuitStatusType) SetCrudInterface(crud ICrud_LawsuitStatusType) {
+func (m LawsuitStatusType) SetCrudInterface(crud ICrud_LawsuitStatusType) {
 	crud_LawsuitStatusType = crud
 
 	return
diff --git a/internal/create_files/model/model.go b/internal/create_files/model/model.go
index 5acd14a..af4bb76 100644
--- a/internal/create_files/model/model.go
+++ b/internal/create_files/model/model.go
@@ -254,6 +254,11 @@ func AddImportTime(TextModel string, Table1 *types.Table) string {
 		return Otvet
 	}
 
+	HasTimeColumn := FindHasTimeColumn(Table1)
+	if HasTimeColumn == false {
+		return Otvet
+	}
+
 	//
 	pos1 = strings.Index(Otvet, "import (")
 	if pos1 < 0 {
@@ -265,3 +270,20 @@ func AddImportTime(TextModel string, Table1 *types.Table) string {
 
 	return Otvet
 }
+
+func FindHasTimeColumn(Table1 *types.Table) bool {
+	Otvet := false
+
+	for _, Column1 := range Table1.MapColumns {
+		SQLMapping1, ok := dbmeta.GetMappings()[Column1.Type]
+		if ok == false {
+			log.Panic("GetMappings() ", Column1.Type, " error: not found")
+		}
+		if SQLMapping1.GoType == "time.Time" {
+			Otvet = true
+			break
+		}
+	}
+
+	return Otvet
+}