[Pharo] Personal fitness tracker web app.
MFTSQLite3Database clean up.
Changed files
src/MyFitnessTracker/MFTSQLite3Database.class.st
@@ -9,7 +9,8 @@
9
9
'defaultLocation',
10
10
'allMuscleGroups',
11
11
'allMuscles',
12
Removed:
'allExercises'
12
Added:
'allExercises',
13
Added:
'testUser'
13
14
],
14
15
#category : #'MyFitnessTracker-Model'
15
16
}
@@ -21,55 +22,17 @@
21
22
]
22
23
23
24
{ #category : #accessing }
24
Removed:
MFTSQLite3Database class >> allExercises: anObject [
25
Removed:
26
Removed:
allExercises := anObject
27
Removed:
]
28
Removed:
29
Removed:
{ #category : #'as yet unclassified' }
30
Removed:
MFTSQLite3Database class >> allExercisesAsDict [
31
Removed:
32
Removed:
| dict |
33
Removed:
dict := Dictionary new.
34
Removed:
allExercises do: [ :exercise |
35
Removed:
dict at: exercise englishName put: exercise ].
36
Removed:
^ dict
37
Removed:
]
38
Removed:
39
Removed:
{ #category : #accessing }
40
25
MFTSQLite3Database class >> allMuscleGroups [
41
26
42
27
^ allMuscleGroups
43
28
]
44
29
45
30
{ #category : #accessing }
46
Removed:
MFTSQLite3Database class >> allMuscleGroups: anObject [
47
Removed:
48
Removed:
allMuscleGroups := anObject
49
Removed:
]
50
Removed:
51
Removed:
{ #category : #'as yet unclassified' }
52
Removed:
MFTSQLite3Database class >> allMuscleGroupsAsDict [
53
Removed:
54
Removed:
| dict |
55
Removed:
dict := Dictionary new.
56
Removed:
allMuscleGroups do: [ :muscleGroup |
57
Removed:
dict at: muscleGroup englishName put: muscleGroup ].
58
Removed:
^ dict
59
Removed:
]
60
Removed:
61
Removed:
{ #category : #accessing }
62
31
MFTSQLite3Database class >> allMuscles [
63
32
64
33
^ allMuscles
65
34
]
66
35
67
Removed:
{ #category : #accessing }
68
Removed:
MFTSQLite3Database class >> allMuscles: anObject [
69
Removed:
70
Removed:
allMuscles := anObject
71
Removed:
]
72
Removed:
73
36
{ #category : #'as yet unclassified' }
74
37
MFTSQLite3Database class >> defaultConnection [
75
38
@@ -82,13 +45,7 @@
82
45
^ defaultLocation
83
46
]
84
47
85
Removed:
{ #category : #accessing }
86
Removed:
MFTSQLite3Database class >> defaultLocation: aFilePath [
87
Removed:
88
Removed:
defaultLocation := aFilePath
89
Removed:
]
90
Removed:
91
Removed:
{ #category : #accessing }
48
Added:
{ #category : #'class initialization' }
92
49
MFTSQLite3Database class >> getAllExercises [
93
50
94
51
| connection allRows |
@@ -99,7 +56,7 @@
99
56
MFTExercise newFromDictionary: row asDictionary ])
100
57
]
101
58
102
Removed:
{ #category : #accessing }
59
Added:
{ #category : #'class initialization' }
103
60
MFTSQLite3Database class >> getAllMuscleGroups [
104
61
105
62
| connection allRows |
@@ -110,7 +67,7 @@
110
67
MFTMuscleGroup newFromDictionary: row asDictionary ])
111
68
]
112
69
113
Removed:
{ #category : #accessing }
70
Added:
{ #category : #'class initialization' }
114
71
MFTSQLite3Database class >> getAllMuscles [
115
72
116
73
| connection allRows |
@@ -166,18 +123,6 @@
166
123
]
167
124
168
125
{ #category : #'as yet unclassified' }
169
Removed:
MFTSQLite3Database class >> getExerciseIdFromName: aString [
170
Removed:
171
Removed:
^ allExercises
172
Removed:
detect: [ :each | each englishName = aString ]
173
Removed:
ifFound: [ :exercise | exercise id ]
174
Removed:
ifNone: [
175
Removed:
self error:
176
Removed:
('No exercise with English name ''{1}'' found' format:
177
Removed:
{ aString }) ]
178
Removed:
]
179
Removed:
180
Removed:
{ #category : #'as yet unclassified' }
181
126
MFTSQLite3Database class >> getExistingUser: aMFTUser [
182
127
183
128
| connection existingUserDict |
@@ -198,7 +143,7 @@
198
143
ifEmpty: [ nil ]
199
144
]
200
145
201
Removed:
{ #category : #'as yet unclassified' }
146
Added:
{ #category : #'class initialization' }
202
147
MFTSQLite3Database class >> getTestUser [
203
148
204
149
| connection testUserDict |
@@ -218,7 +163,8 @@
218
163
fullName.
219
164
allMuscleGroups := self getAllMuscleGroups.
220
165
allMuscles := self getAllMuscles.
221
Removed:
allExercises := self getAllExercises
166
Added:
allExercises := self getAllExercises.
167
Added:
testUser := self getTestUser.
222
168
]
223
169
224
170
{ #category : #'instance creation' }
@@ -243,7 +189,7 @@
243
189
MFTSQLite3Database class >> populatePlaceholderWorkouts [
244
190
245
191
| db |
246
Removed:
db := self newOnDefaultLocation userId: 1.
192
Added:
db := self newOnDefaultLocation userId: testUser id.
247
193
db connection open.
248
194
db connection
249
195
execute: 'DELETE FROM Workouts';
@@ -269,21 +215,6 @@
269
215
close ]
270
216
]
271
217
272
Removed:
{ #category : #'as yet unclassified' }
273
Removed:
MFTSQLite3Database class >> selectUser: id [
274
Removed:
275
Removed:
| connection user |
276
Removed:
connection := self defaultConnection.
277
Removed:
connection open.
278
Removed:
user := (connection
279
Removed:
execute: 'SELECT *
280
Removed:
FROM users
281
Removed:
WHERE id = ?'
282
Removed:
value: id) onlyRow.
283
Removed:
connection close.
284
Removed:
^ user
285
Removed:
]
286
Removed:
287
218
{ #category : #setting }
288
219
MFTSQLite3Database class >> storeProspectEmail: anEmail [
289
220
@@ -293,6 +224,12 @@
293
224
value: anEmail
294
225
value: DateAndTime now asUTC rounded;
295
226
close
227
Added:
]
228
Added:
229
Added:
{ #category : #accessing }
230
Added:
MFTSQLite3Database class >> testUser [
231
Added:
232
Added:
^ testUser
296
233
]
297
234
298
235
{ #category : #'as yet unclassified' }
src/MyFitnessTracker/MFTWorkout.class.st
@@ -26,9 +26,7 @@
26
26
{ #category : #'as yet unclassified' }
27
27
MFTWorkout class >> placeholderCollection [
28
28
29
Removed:
| allMuscleGroups allExercises placeholderSets workout1 workout2 workout3 |
30
Removed:
allMuscleGroups := MFTSQLite3Database allMuscleGroupsAsDict.
31
Removed:
allExercises := MFTSQLite3Database allExercisesAsDict.
29
Added:
| placeholderSets workout1 workout2 workout3 |
32
30
placeholderSets := MFTSet placeholderCollection.
33
31
workout1 := self new
34
32
id: 1;