сделал StringDatePeriod_rus()

micro/microfunctions.go

@@ -1660,8 +1660,8 @@ func DateFromToToday_rus() (time.Time, time.Time) {
 	return Date1, Date2
 }
 
-// StringDatePeriod_rus - возвращает строку с периодом дат
+// StringDateSPo_rus - возвращает строку с периодом дат
-func StringDatePeriod_rus(Date1, Date2 time.Time) string {
+func StringDateSPo_rus(Date1, Date2 time.Time) string {
 	Otvet := ""
 
 	Date1_00 := carbon.CreateFromStdTime(Date1).StartOfDay().StdTime()
@@ -1674,3 +1674,18 @@ func StringDatePeriod_rus(Date1, Date2 time.Time) string {
 
 	return Otvet
 }
+
+// StringDatePeriod_rus - возвращает строку с периодом дат
+func StringDatePeriod_rus(Date1, Date2 time.Time) string {
+	Otvet := ""
+
+	Date1_00 := carbon.CreateFromStdTime(Date1).StartOfDay().StdTime()
+	Date2_00 := carbon.CreateFromStdTime(Date2).StartOfDay().StdTime()
+	if Date1_00 == Date2_00 {
+		Otvet = "на дату: " + StringDate(Date1_00)
+	} else {
+		Otvet = fmt.Sprintf("%s - %s", StringDate(Date1_00), StringDate(Date2_00))
+	}
+
+	return Otvet
+}

micro/microfunctions_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/ManyakRus/starter/constants"
 	"github.com/ManyakRus/starter/contextmain"
 	"github.com/google/uuid"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -1481,7 +1482,18 @@ func TestDateFromToToday_rus(t *testing.T) {
 }
 
 func TestStringDatePeriod_rus(t *testing.T) {
-	Otvet := StringDatePeriod_rus(time.Now(), time.Now())
+	Date1 := time.Date(2025, 04, 01, 0, 0, 0, 0, constants.Loc)
+	Date2 := time.Date(2025, 04, 23, 0, 0, 0, 0, constants.Loc)
+	Otvet := StringDatePeriod_rus(Date1, Date2)
+	if Otvet == "" {
+		t.Errorf("error: Expected not empty string, but got %s", Otvet)
+	}
+}
+
+func TestStringDateSPo_rus(t *testing.T) {
+	Date1 := time.Date(2025, 04, 01, 0, 0, 0, 0, constants.Loc)
+	Date2 := time.Date(2025, 04, 23, 0, 0, 0, 0, constants.Loc)
+	Otvet := StringDateSPo_rus(Date1, Date2)
 	if Otvet == "" {
 		t.Errorf("error: Expected not empty string, but got %s", Otvet)
 	}