Skip to content

Commit b971a46

Browse files
realtemirovrealtemirov
committed
fix bug folder
1 parent e6edbca commit b971a46

File tree

4 files changed

+68
-55
lines changed

4 files changed

+68
-55
lines changed

‎main.go

Lines changed: 60 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -57,34 +57,37 @@ func NewRepository(datas ...any) error {
5757
err := os.Mkdir(repositoryPath, 0755)
5858
if err != nil {
5959
if strings.Contains(err.Error(), "exists") {
60-
fmt.Println("repository folder already exist, If you want to create new repository, click something else `y` or `Y`")
60+
fmt.Println("repository folder already exist, If you want to create new repository click something else `y` or `Y`")
6161
var answer string
6262
fmt.Scanln(&answer)
63-
if answer == "q" || answer == "Q" {
63+
if strings.ToLower(answer) != "y" {
6464
return nil
6565
}
6666
err := os.RemoveAll(repositoryPath)
67+
os.Mkdir(repositoryPath, 0755)
6768
if err != nil {
69+
fmt.Println(err.Error())
6870
return err
6971
}
7072
}
71-
} else {
72-
err := os.Mkdir(repositoryPath+"/"+postgresPath, 0755)
73-
if err != nil {
74-
if strings.Contains(err.Error(), "exists") {
75-
fmt.Println("repository/postgres folder already exist, If you want to create new repository/postgres, click something else `y` or `Y`")
76-
var answer string
77-
fmt.Scanln(&answer)
78-
if answer == "q" || answer == "Q" {
79-
return nil
80-
}
81-
err := os.RemoveAll(repositoryPath + "/" + postgresPath)
82-
if err != nil {
83-
return err
84-
}
73+
}
74+
75+
err = os.Mkdir(repositoryPath+"/"+postgresPath, 0755)
76+
if err != nil {
77+
if strings.Contains(err.Error(), "exists") {
78+
fmt.Println("repository/postgres folder already exist, If you want to create new repository/postgres click something else `y` or `Y`")
79+
var answer string
80+
fmt.Scanln(&answer)
81+
if strings.ToLower(answer) != "y" {
82+
return nil
83+
}
84+
err := os.RemoveAll(repositoryPath + "/" + postgresPath)
85+
if err != nil {
86+
return err
8587
}
8688
}
8789
}
90+
8891
storage.WriteString(storageHeader())
8992
postgresUp.WriteString(postgresHeader())
9093
for _, model := range datas {
@@ -100,12 +103,12 @@ func NewRepository(datas ...any) error {
100103
log.Println("Starting repository...")
101104
err = repositoryFiles(createRepository(upperNameOfModel, lowerNameOfModel, fieldsOfModel), lowerNameOfModel)
102105
if err != nil {
103-
return clear(err)
106+
return clear("repository", err)
104107
}
105108
interfaceName, interfaceMethods := storageInterface(upperNameOfModel, lowerNameOfModel, fieldsOfModel)
106109
storage.WriteString(interfaceName)
107110
interfaces.WriteString(interfaceMethods)
108-
log.Println("Successful repository implemented")
111+
109112
postgresUpString, postgresDownString := postgresInterface(upperNameOfModel, lowerNameOfModel)
110113

111114
postgresUp.WriteString(postgresUpString)
@@ -117,7 +120,7 @@ func NewRepository(datas ...any) error {
117120
storage.WriteString(interfaces.String())
118121
storageFile(storage.String())
119122
postgresFile(postgresUp.String(), postgresDown.String())
120-
log.Println("Succesfull implemented...")
123+
log.Println("Successful repository implemented")
121124
return nil
122125
}
123126

@@ -128,7 +131,7 @@ func NewMigration(datas ...any) error {
128131
fmt.Println("migration folder already exist, If you want to create new migration, click something else `y` or `Y`")
129132
var answer string
130133
fmt.Scanln(&answer)
131-
if answer == "q" || answer == "Q" {
134+
if strings.ToLower(answer) != "y" {
132135
return nil
133136
}
134137
err := os.RemoveAll(migrationPath)
@@ -143,7 +146,7 @@ func NewMigration(datas ...any) error {
143146
fmt.Println("migration/postgres folder already exist, If you want to create new migration/postgres, click something else `y` or `Y`")
144147
var answer string
145148
fmt.Scanln(&answer)
146-
if answer == "q" || answer == "Q" {
149+
if strings.ToLower(answer) != "y" {
147150
return nil
148151
}
149152
err := os.RemoveAll(migrationPath + "/" + postgresPath)
@@ -183,7 +186,7 @@ func NewTest(datas ...any) error {
183186
fmt.Println("test folder already exist, If you want to create new test, click something else `y` or `Y`")
184187
var answer string
185188
fmt.Scanln(&answer)
186-
if answer == "q" || answer == "Q" {
189+
if strings.ToLower(answer) != "y" {
187190
return nil
188191
}
189192
err := os.RemoveAll(testPath)
@@ -198,7 +201,7 @@ func NewTest(datas ...any) error {
198201
fmt.Println("test/postgres folder already exist, If you want to create new test/postgres, click something else `y` or `Y`")
199202
var answer string
200203
fmt.Scanln(&answer)
201-
if answer == "q" || answer == "Q" {
204+
if strings.ToLower(answer) != "y" {
202205
return nil
203206
}
204207
err := os.RemoveAll(testPath + "/" + postgresPath)
@@ -221,7 +224,7 @@ func NewTest(datas ...any) error {
221224
log.Println("Starting test...")
222225
err = testFiles(createTest(lowerNameOfModel, fieldsOfModel), lowerNameOfModel)
223226
if err != nil {
224-
return clear(err)
227+
return clear("test", err)
225228
}
226229

227230
log.Println("Successful test implemented")
@@ -230,32 +233,42 @@ func NewTest(datas ...any) error {
230233
return nil
231234
}
232235

233-
func clear(response error) error {
236+
func clear(data string, response error) error {
234237

235-
if _, err := os.Stat(migrationPath + "/" + postgresPath); os.IsExist(err) {
236-
err = os.RemoveAll(migrationPath + "/" + postgresPath)
237-
if err != nil {
238-
log.Printf("Error: %v", err)
238+
switch data {
239+
case "repository":
240+
{
241+
if _, err := os.Stat(repositoryPath + "/" + postgresPath); os.IsExist(err) {
242+
err = os.RemoveAll(repositoryPath + "/" + postgresPath)
243+
if err != nil {
244+
log.Printf("Error: %v", err)
245+
}
246+
} else {
247+
log.Printf("Error: %v", err)
248+
}
239249
}
240-
} else {
241-
log.Printf("Error: %v", err)
242-
}
243-
if _, err := os.Stat(repositoryPath + "/" + postgresPath); os.IsExist(err) {
244-
err = os.RemoveAll(repositoryPath + "/" + postgresPath)
245-
if err != nil {
246-
log.Printf("Error: %v", err)
250+
case "migration":
251+
{
252+
if _, err := os.Stat(migrationPath + "/" + postgresPath); os.IsExist(err) {
253+
err = os.RemoveAll(migrationPath + "/" + postgresPath)
254+
if err != nil {
255+
log.Printf("Error: %v", err)
256+
}
257+
} else {
258+
log.Printf("Error: %v", err)
259+
}
247260
}
248-
} else {
249-
log.Printf("Error: %v", err)
250-
}
251-
252-
if _, err := os.Stat(testPath + "/" + postgresPath); os.IsExist(err) {
253-
err = os.RemoveAll(testPath + "/" + postgresPath)
254-
if err != nil {
255-
log.Printf("Error: %v", err)
261+
case "test":
262+
{
263+
if _, err := os.Stat(testPath + "/" + postgresPath); os.IsExist(err) {
264+
err = os.RemoveAll(testPath + "/" + postgresPath)
265+
if err != nil {
266+
log.Printf("Error: %v", err)
267+
}
268+
} else {
269+
log.Printf("Error: %v", err)
270+
}
256271
}
257-
} else {
258-
log.Printf("Error: %v", err)
259272
}
260273

261274
return response
@@ -283,7 +296,7 @@ func NewModels(datas ...any) error {
283296
fmt.Println("migration/postgres folder already exist, If you want to create new migration/postgres, click something else `y` or `Y`")
284297
var answer string
285298
fmt.Scanln(&answer)
286-
if answer == "q" || answer == "Q" {
299+
if strings.ToLower(answer) != "y" {
287300
return nil
288301
}
289302
err := os.RemoveAll(migrationPath + "/" + postgresPath)

‎migration.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ func migrationFiles(nameOfModel, create, drop string) error {
2727

2828
file, err := os.Create(fmt.Sprintf("%s/%s/01_create_%s.up.sql", migrationPath, postgresPath, nameOfModel))
2929
if err != nil {
30-
return clear(err)
30+
return clear("migration", err)
3131
}
3232
_, err = file.Write([]byte(create))
3333
if err != nil {
34-
return clear(err)
34+
return clear("migration", err)
3535
}
3636

3737
file, err = os.Create(fmt.Sprintf("%s/%s/01_create_%s.down.sql", migrationPath, postgresPath, nameOfModel))
3838
if err != nil {
39-
return clear(err)
39+
return clear("migration", err)
4040
}
4141
_, err = file.Write([]byte(drop))
4242
if err != nil {
43-
return clear(err)
43+
return clear("migration", err)
4444
}
4545
return nil
4646
}

‎repository.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ func repositoryFiles(repos, nameOfModel string) error {
2222

2323
file, err := os.Create(repositoryPath + "/" + postgresPath + "/" + nameOfModel + ".go")
2424
if err != nil {
25-
return clear(err)
25+
return clear("repository", err)
2626
}
2727
_, err = file.Write([]byte(repos))
2828
if err != nil {
29-
return clear(err)
29+
return clear("repository", err)
3030
}
3131
return nil
3232
}

‎test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ func testFiles(tests, nameOfModel string) error {
1111

1212
file, err := os.Create(testPath + "/" + postgresPath + "/" + nameOfModel + ".go")
1313
if err != nil {
14-
return clear(err)
14+
return clear("test", err)
1515
}
1616
_, err = file.Write([]byte(tests))
1717
if err != nil {
18-
return clear(err)
18+
return clear("test", err)
1919
}
2020
return nil
2121
}

0 commit comments

Comments
 (0)