-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgit
2442 lines (1655 loc) · 76 KB
/
git
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
[33mcommit e3e8ab50ca56ca4663c4c3625824464509566024[m[33m ([m[1;36mHEAD -> [m[1;32mphase_3[m[33m, [m[1;31morigin/phase_3[m[33m)[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sun May 23 17:12:44 2021 +0200
test delete user
[33mcommit e7943bf2e206d2aa06bb3b27872c170fb963445e[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sun May 23 17:05:57 2021 +0200
catch exception in deleteUser
[33mcommit 121089e790ea3d462ba9ac6271977b44d1ec8f82[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sun May 23 16:57:10 2021 +0200
test addNewUser
[33mcommit a1f17bf93cb9c3838231013b3b641df2c1e2e963[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sun May 23 16:37:11 2021 +0200
catch exception in addNewUser
[33mcommit 6bfbeb49757e2ab9c84b7478a0f85bc7ce82cf20[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Sun May 23 16:30:28 2021 +0200
till testDeleteTables
[33mcommit 5a37695d757bf5e4d2468093d11fccde05d33d70[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Sun May 23 12:06:50 2021 +0200
test till testTicketByReturnId
[33mcommit c1c6709d4245131cc23c9d901fe1a17f8e8e1787[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Sun May 23 09:38:46 2021 +0200
i dont remember
[33mcommit f531d10e07b45e43db157d3125d8e19f8e3732d9[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Sun May 23 09:01:10 2021 +0200
close connection if exception throwed in balance op rep
[33mcommit 404fb63fe3eb9a2485612f8101374dff0380d039[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sun May 23 00:38:43 2021 +0200
testGetAllUsers done
[33mcommit a72afadd01ac47e7776cd90972e6ab9d27e32c89[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sun May 23 00:37:17 2021 +0200
testSetLoggedUser done
[33mcommit bbe35fec2fd0c53984d96639b2fd2748fc37b9f1[m
Merge: 295bef5 0033272
Author: setareh askari <s288485@studenti.polito.it>
Date: Sun May 23 00:33:45 2021 +0200
Merge remote-tracking branch 'origin/phase_3' into phase_3
[33mcommit 295bef5402f30d35b3bcde2a62de8d070a03813b[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sun May 23 00:33:37 2021 +0200
user repository test added
[33mcommit 0033272674641623881b4e2bbd9aeea84cfd9319[m
Author: Setareh Askarifirouzjaei <s288485@studenti.polito.it>
Date: Sat May 22 20:05:29 2021 +0000
Update IntegrationAPITestReport.md
[33mcommit 2640067602dff9d40b86c0c7bee7a44fd91f3bea[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 22 22:02:50 2021 +0200
add description
[33mcommit 24e234c6d33f3313d9731515764ae11c81336de6[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 22 20:07:18 2021 +0200
complete step 1 and 2 of report
[33mcommit 3ae8937a9711cf3b59efbe59dba55e1c0e9a2d61[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 22 20:00:39 2021 +0200
create UserRepositoryTest
[33mcommit 88e3d10dfc4da2eb0db4c46f68fccffd83f77f48[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 22 19:56:06 2021 +0200
adding some part of step 1 and step 2 in report
[33mcommit 0278efb5227ca0791c699f8111b0f6cd6545eca1[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 22 19:49:03 2021 +0200
CustomerRepositoryTest done
[33mcommit b96986cbb66fbb5a212f9f5b91fe4d3d8ab69a68[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Sat May 22 18:01:28 2021 +0200
test done till testUpdateTest ( junit dont test all test)
[33mcommit d88346539e954cfdef9ff602e14d3a2ff4f9c4bc[m
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Sat May 22 16:54:11 2021 +0200
ProductTypeRepository test not finished
[33mcommit 993c94d323c2423b6701a09a1216c4d4f80d6358[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 22 15:28:42 2021 +0200
test ChangeDataOfACustomer
[33mcommit 17eee52bb300a2d2629273f06fc76cf6455c9e5c[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 22 13:02:11 2021 +0200
test initialize
[33mcommit 8b41ff4e9ff9716bcd459cde4d21f594d11772d1[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 22 12:21:59 2021 +0200
test addNewCustomer, unit test for hashgenerator created needs to be implemented
[33mcommit a38cd8dbb5fbac89a4a48f92ab9612ba763a5d16[m
Author: Setareh Askarifirouzjaei <s288485@studenti.polito.it>
Date: Sat May 22 08:45:51 2021 +0000
add dependency graph
[33mcommit 8421161f9e213ebcf3ca56e2e9ad34b366b98d66[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 22 10:35:11 2021 +0200
check role for get all orders
[33mcommit b9e4ef21bbe1bc56f007629467bbdbdc3db1396d[m
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Sat May 22 10:09:59 2021 +0200
changes in modifyCustomer and getAllOrders
[33mcommit 51a05ac93eaf3932ed60600f76e3d9866024f1c1[m
Merge: 37e305e 0601395
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Sat May 22 09:19:01 2021 +0200
Merge branch 'phase_3' of https://git-softeng.polito.it/se-2021/group-12/ezshop into phase_3
[33mcommit 37e305e80a04e15f2d31e56af30a61d0d4e0cac6[m
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Sat May 22 09:18:56 2021 +0200
little changes
[33mcommit 0601395720181a8c380ca6023410a763ddec7b35[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Fri May 21 20:11:48 2021 +0200
reformat code
[33mcommit d7d2fbad3a368e60069b2a6f00de927b18623f8f[m
Merge: a19ee93 c7a933d
Author: setareh askari <s288485@studenti.polito.it>
Date: Fri May 21 20:09:43 2021 +0200
Merge remote-tracking branch 'origin/phase_3' into phase_3
[33mcommit a19ee932574d1db13af8fd6684bb0300a0c93b09[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Fri May 21 20:09:32 2021 +0200
fix #5
[33mcommit c7a933d604eeedac4e502fcab95dccddfa364a34[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Fri May 21 19:27:30 2021 +0200
test of add method in balance repository
[33mcommit 0f05402ab225cb9e45e02cb4498d49e2e5c073c5[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Fri May 21 18:44:31 2021 +0200
'balanceTable' test done
[33mcommit 449fe33edbfde8356d9ec049fb882dd261cafa4c[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Fri May 21 16:35:29 2021 +0200
balanceOperationRepositoryTest class created
[33mcommit ac11f210096788061202f092d36bd325579f8005[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Thu May 20 00:01:50 2021 +0200
change stuff
[33mcommit 536872238a1e79f4ff58e72fa67f0c8937fc7a19[m
Merge: 131e459 198a3c5
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Thu May 20 00:00:48 2021 +0200
change stuff
[33mcommit 131e4599072e114c33d8d346898bc5dce67c675a[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 23:59:05 2021 +0200
change stuff
[33mcommit 198a3c5501746f23e632d6fbcf6eef271ac8fb12[m
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Wed May 19 23:47:20 2021 +0200
things
[33mcommit 74c61278b78d47d479d4d128c1051885886d1978[m
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Wed May 19 23:35:42 2021 +0200
balances of creditcards
[33mcommit d7a882db879cb5f8f0efd9754d18421e60a5d836[m
Merge: 249f84c d7ee93e
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Wed May 19 23:34:36 2021 +0200
credit card and conflict inside report
[33mcommit 249f84c4b43538deffe23236833ba427e3536b1c[m
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Wed May 19 23:24:54 2021 +0200
write credit card file
[33mcommit d7ee93edebd7dd6698d6105357684720773b32b9[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 23:23:01 2021 +0200
complete unit test report
[33mcommit 5cfa863fbf5b38441c424ecea5ca21a781088116[m
Merge: 89df622 0ff6d0e
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 23:15:18 2021 +0200
Merge branch 'phase_3' of git-softeng.polito.it:se-2021/group-12/ezshop into phase_3
[33mcommit 0ff6d0ee085893a94e25106afad5c9ba8ac6c0b6[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 23:11:57 2021 +0200
add logger
[33mcommit 6a4046075071a575577e77fafdf1373323b1bdff[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 23:08:14 2021 +0200
fix bug
[33mcommit 89df62293e8acf8de8971d6872ad6586ca2b99f7[m
Merge: cefdff2 a24b26e
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 23:07:23 2021 +0200
Merge branch 'phase_3' of git-softeng.polito.it:se-2021/group-12/ezshop into phase_3
[33mcommit cefdff2d39a1ff3cfaff3337bbee08e8d17b7e5f[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 23:07:04 2021 +0200
UT restoring
[33mcommit a24b26eafecbc81a03b7ca6d3c4827347fe50319[m
Merge: a7f4664 030a72c
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 23:01:43 2021 +0200
Merge remote-tracking branch 'origin/phase_3' into phase_3
[33mcommit a7f466433221db577e012676fe805f8af147e202[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 23:01:34 2021 +0200
add wb tests
[33mcommit 030a72c6efd965be70fa18ce9137589e665bf057[m
Merge: 39c1344 41ea259
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 23:00:07 2021 +0200
sincronizing
[33mcommit 39c134445f48538d2342e8fb6d28123eb9b4f13c[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 22:59:31 2021 +0200
sincronizing
[33mcommit 41ea2595c91740e40458a7c884cc31ae48eed4d8[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 22:58:58 2021 +0200
add new wb tests
[33mcommit 11dcc169b934946aa9ae02748e6c97c4a5aa706e[m
Merge: 5d0eb22 a616ec9
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 22:53:48 2021 +0200
Merge remote-tracking branch 'origin/phase_3' into phase_3
[33mcommit 5d0eb220b50c8e025418fcde575976f2390adb41[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 22:53:34 2021 +0200
complete unit test report
[33mcommit a616ec91a913b31b3605537f1af8b1a0913e9a4e[m
Merge: 9a8da84 ab4f869
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 22:19:29 2021 +0200
BB and WB testing
[33mcommit 9a8da84988ce3e9dc28a68f0b51d8f0435232ac3[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 22:19:09 2021 +0200
BB and WB testing
[33mcommit ab4f869cae1478ff684b434e1dbc1d491dd39215[m
Merge: ec58abf 124b715
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 22:13:52 2021 +0200
Merge remote-tracking branch 'origin/phase_3' into phase_3
[33mcommit ec58abf4d3d3ac43a582ca587ec1507a112a35f9[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 22:13:45 2021 +0200
change parameters in create random int test
[33mcommit 124b715d82ef041cdf978cb480f917558896270d[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 21:06:14 2021 +0200
conflixt correction
[33mcommit 97a43c67d80b94059340c229bc7d59c8593b83e8[m
Merge: 1c20828 2a55775
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 20:57:03 2021 +0200
BB report upload
[33mcommit 1c208285f8262af95c56216f820aaa6678165212[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 20:56:34 2021 +0200
BB report upload
[33mcommit 2a55775569e443c950b87f38d42dfd36bfde5d69[m
Merge: 3b12d3c 805d10d
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Wed May 19 20:43:03 2021 +0200
bb dani
[33mcommit 3b12d3c8c75d463ff270aa49d95948853f75be7d[m
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Wed May 19 20:30:31 2021 +0200
bb dani
[33mcommit 805d10dbbea4e22c9fd639a8e410c4be2ecb683b[m
Merge: f77c877 d8aa265
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 20:05:01 2021 +0200
fix bug : localDate still present in createStatement
[33mcommit f77c8776656fb1b19d9aa8475a95ae2207d4e356[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 20:04:03 2021 +0200
fix bug : localDate still present in createStatement
[33mcommit d8aa265910978c9e4ead2096fa865afd9be0d776[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 17:19:11 2021 +0000
Update Deliverables/Images/design/matrix.PNG, Deliverables/DesignDocument.md files
[33mcommit 4107af15e73d11b7da37e1a02661e4d291394859[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 19:00:51 2021 +0200
add classes to suite
[33mcommit 3949607c5902f5f08397089ed5da396fb4e1ab81[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 18:29:48 2021 +0200
fix error
[33mcommit cd3fd73298cf201e7e1c62994543310526635e06[m
Merge: cec8317 7be1b58
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 18:15:56 2021 +0200
eugenio BB
[33mcommit cec8317477cc87bfdcaea9cb514e43c159a256fb[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 18:15:30 2021 +0200
eugenio BB
[33mcommit 7a5a72cea4b6b6c651d3e3d236223322f81d8077[m
Merge: 9022afb 7be1b58
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Wed May 19 17:49:35 2021 +0200
little changes
[33mcommit 9022afb2e9a19c82a95af27ae191253a4b05aa10[m
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Wed May 19 17:24:38 2021 +0200
little changes
[33mcommit 7be1b580723adb05a241ca45285155278a4e883c[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 17:10:18 2021 +0200
test onlyDigits report also done
[33mcommit 179531c68d9431aa121d8a273c7a78c27eb0f290[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 16:59:26 2021 +0200
test createRandomInteger report also done
[33mcommit 82c9f4510c5ebec476c6bcc1d7269a07e0454377[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 16:19:36 2021 +0200
onlyDigits test done
[33mcommit 16809e774a05f232c78d2136228a228eaeef0e9e[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 16:11:29 2021 +0200
createRandomInteger test done
[33mcommit dd1d5957ba42dc440e244adb5ce8f35d063c627e[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 15:53:55 2021 +0200
make create random int public
[33mcommit 5e77b3b339c73a914a5df89cecb0433f1bf592a2[m
Merge: 8a59b49 69f1e61
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 15:25:35 2021 +0200
Merge branch 'phase_3' of git-softeng.polito.it:se-2021/group-12/ezshop into phase_3
[33mcommit 8a59b49761a99c319fa17561e1e03de3658e1d95[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 15:25:19 2021 +0200
EZShoptest created
[33mcommit 69f1e61ec97785ba7200332a5fc498525952ebfa[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 15:25:09 2021 +0200
modify unit test report
[33mcommit 54b115b3082dcc3f54f9e07f0e069dbe7658ae69[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 15:18:40 2021 +0200
EZShoptest created
[33mcommit d0b995a421d113b278c8e6673835c1743f6e30f0[m
Merge: 1b7dbbe 460fc7e
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 14:18:18 2021 +0200
Merge branch 'phase_3' of git-softeng.polito.it:se-2021/group-12/ezshop into phase_3
[33mcommit 1b7dbbefa1e6f761a56e37630a24b5804f7c3cda[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 14:17:55 2021 +0200
fixed checkUniqueProductCode error
[33mcommit 460fc7e5361dc594edc8892c8cca12b3fdb279ea[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 10:59:16 2021 +0000
Update Deliverables/UnitTestReport.md
[33mcommit b782d2350b67d1a1980168b224a5dc61dd127445[m
Merge: e1239ed 2a47b33
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 11:29:35 2021 +0200
BalanceOperationRepositoryTest.java created
[33mcommit e1239ed2ccf8b5e3b3c26b6edf008af71baaa7fe[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 11:28:25 2021 +0200
BalanceOperationRepositoryTest.java created
[33mcommit 2a47b33ba13ceaad46026c60575170bff27f0460[m
Merge: b4aae62 5a1ffa4
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 10:54:26 2021 +0200
Merge remote-tracking branch 'origin/phase_3' into phase_3
[33mcommit b4aae6240f9b2a515534f6f1cdafc87cf5b42d23[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 10:54:19 2021 +0200
create CustomerRepositoryTest
[33mcommit e7f4ec86082c12eb0e6f0590b3a686be6d3a6e29[m
Merge: 4875b38 5a1ffa4
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 10:40:42 2021 +0200
Merge branch 'phase_3' of git-softeng.polito.it:se-2021/group-12/ezshop into phase_3
[33mcommit 4875b38a281e60dd114423ad4e0f4970c7f9aff6[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 10:40:18 2021 +0200
sincronizing
[33mcommit 5a1ffa4df56d174684a696653a9e1e2a111bb46f[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 08:33:03 2021 +0000
Update Deliverables/Images/design/1.png, Deliverables/Images/design/2.png, Deliverables/Images/design/3.png, Deliverables/Images/design/4.png, Deliverables/Images/design/6_1_3.png, Deliverables/Images/design/6_4_6.png, Deliverables/Images/design/7.png, Deliverables/Images/design/8.png, Deliverables/Images/design/class_diagram.png, Deliverables/Images/design/traciability matr.PNG files
[33mcommit dc582052ba9d2bef3c42ea0bfde108d57b244667[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Wed May 19 08:23:27 2021 +0000
Update 1.png, 2.png, 3.png, 4.png, 6_1_3.png, 6_4_6.png, 7.png, 8.png, traciability matr.PNG, class_diagram.png, Deliverables/DesignDocument.md files
Deleted Deliverables/Images/design/1.png, Deliverables/Images/design/2.1.png, Deliverables/Images/design/2.2.png, Deliverables/Images/design/2.3.png, Deliverables/Images/design/3.1.png, Deliverables/Images/design/3.2.png, Deliverables/Images/design/3.3.png, Deliverables/Images/design/4.1.png, Deliverables/Images/design/4.2.png, Deliverables/Images/design/4.3.png, Deliverables/Images/design/4.4.png, Deliverables/Images/design/6.1.png, Deliverables/Images/design/6.2.png, Deliverables/Images/design/6.3.png, Deliverables/Images/design/6.4.png, Deliverables/Images/design/6.5.png, Deliverables/Images/design/6.6.png, Deliverables/Images/design/7.1.png, Deliverables/Images/design/7.2.png, Deliverables/Images/design/7.3.png, Deliverables/Images/design/7.4.png, Deliverables/Images/design/8.1.png, Deliverables/Images/design/8.2.png, Deliverables/Images/design/9.1.png, Deliverables/Images/design/matrix.png, Deliverables/Images/design/class_diagram.png, Deliverables/Images/design/10.1.png, Deliverables/Images/design/10.2.png files
[33mcommit ae991fbd9112d56cdb8b9539bdabd902b0b1d9d7[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Wed May 19 00:47:24 2021 +0200
customer and user model bb test report
[33mcommit 7979150c1a1b9bc7d5ecff03ba293d70cf69057e[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Tue May 18 23:12:16 2021 +0200
CustomerClassTest done
[33mcommit 13e067bb179337287ea2d03bc6087a631fa1e29f[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Tue May 18 22:50:40 2021 +0200
UserClassTest done
[33mcommit 4e4e0b6c5ef9d2aa90116d3a8904c1c72a0e6458[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Tue May 18 21:09:44 2021 +0200
implement reset
[33mcommit 913a451c8d8d918e839758114b04226f52e105ea[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Tue May 18 19:48:20 2021 +0200
fix conflict
[33mcommit a04ba83afae67f08523bfe55896dfe91624cdb6c[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Tue May 18 17:46:54 2021 +0200
correction of checkProductCode
[33mcommit 4f83e184385f8310e7285f714961d00290bdb72e[m
Merge: 6151455 4fc6565
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Tue May 18 17:44:16 2021 +0200
correction of checkProductCode
[33mcommit 6151455398af4c3a96e485458f4ebb74ff3bc485[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Tue May 18 17:43:34 2021 +0200
correction of checkProductCode
[33mcommit ac96fe3ff8deb1fd91897fb255c2216eab8d7166[m
Merge: 2bd9369 4fc6565
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Tue May 18 17:28:20 2021 +0200
Merge branch 'phase_3' of https://git-softeng.polito.it/se-2021/group-12/ezshop into phase_3
[33mcommit 2bd936949463a1c24d1107e2e0cc0cf16e8f5bf8[m
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Tue May 18 17:25:48 2021 +0200
little changes
[33mcommit 4fc65657e20d239795c72539daca18e796379190[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Tue May 18 17:20:14 2021 +0200
uncomment barcode checker
[33mcommit ac015ca3cd47a1bb77d898e9e3b02401b882ce4e[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Tue May 18 16:41:30 2021 +0200
getCreditAndDebit : implementation of swapped from/to
[33mcommit c85bcb8fc3ca3ab6487951ef03b1c2d52e2cb1b1[m
Merge: 3200dc6 6b07d7d
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Tue May 18 16:06:24 2021 +0200
Merge branch 'phase_3' of https://git-softeng.polito.it/se-2021/group-12/ezshop into phase_3
[33mcommit 6b07d7d33580c6d826b62b4088d95651a2c71ac2[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Tue May 18 15:53:39 2021 +0200
added control of from/to parameter inside getCreditAndDebit()
[33mcommit 3200dc6bf1fe362c0c3673b430adb8eb41beaa69[m
Merge: d84953f a5a2b8f
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Tue May 18 15:40:21 2021 +0200
Merge branch 'phase_3' of https://git-softeng.polito.it/se-2021/group-12/ezshop into phase_3
[33mcommit d84953fff7b38b61a712b9ab5327f5beed18b639[m
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Tue May 18 15:40:11 2021 +0200
changes
[33mcommit a5a2b8f06b255337a02427c0b000ed4e475536d4[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Tue May 18 14:47:07 2021 +0200
create user repository test
[33mcommit 88fbf719a25ff2e69c64db468b98be69b6db4ab1[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Tue May 18 14:38:13 2021 +0200
add test suite
[33mcommit 455c960feb42942c0b8de9b96c6a45ca32c696c2[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Tue May 18 11:12:31 2021 +0200
remove api test for now
[33mcommit e04db7d3ac1ee6fd808fcf13ecd9d575d549ec74[m
Merge: 9c6a6ae 87a7ff3
Author: setareh askari <s288485@studenti.polito.it>
Date: Tue May 18 09:21:09 2021 +0200
Merge remote-tracking branch 'origin/phase_3' into phase_3
[33mcommit 9c6a6ae1cfdaf99a5381894b26b91940fd8b2382[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Tue May 18 09:20:59 2021 +0200
remove commit
[33mcommit 87a7ff3ed127961a01bb7bbc3a34cb531b11a66b[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Mon May 17 16:56:45 2021 +0200
getCreditAndDebit error caused by rs.getDate() solved
[33mcommit edf4b1caeefe338119cebaccae90ce1bf948b979[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 14:17:53 2021 +0200
delete return transaction works fine
[33mcommit 8d6a62e19bd23206d147fbd37b34c218bfcfddf7[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 14:11:21 2021 +0200
delete return transaction
[33mcommit 2e5367235bb4efe7bea8ed890fd13d969cc96091[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 13:37:38 2021 +0200
fix bug in end return
[33mcommit 8977fd6eb79558179269e1edc60ace3a4c091831[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 13:31:45 2021 +0200
remove unused code
[33mcommit e6eac96c2db0296a5268e856f80556a838d9af12[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 13:13:59 2021 +0200
Revert "uncomment check barcode"
This reverts commit a2bdf370
[33mcommit a2bdf3701c0d42dc63d04d15e9b8061c63fca482[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 13:07:53 2021 +0200
uncomment check barcode
[33mcommit a594f8a8d8cdc6d33db2eeb482adb72eb407bc26[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 13:06:49 2021 +0200
fix bug
[33mcommit 976238a4366c5837271eb32515e93a4c8aa45fd2[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 12:54:00 2021 +0200
fix bug
[33mcommit 9cdbe1ba8f991f162d5edfbef7a0ca7083d2e390[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 12:50:00 2021 +0200
fix bug
[33mcommit 7b3abde22ccb5b8728d34486962def4a0915077e[m
Merge: 192f283 9af2332
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 12:47:19 2021 +0200
Merge remote-tracking branch 'origin/phase_3' into phase_3
# Conflicts:
# ezshop.db
[33mcommit 192f283a38bf9004a29d3a47fb0bca8e86787074[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 12:46:52 2021 +0200
update the price of sale transaction
[33mcommit 9af2332c87b35f778f6ac3a2b405f190726a6e46[m
Merge: ddad4e3 3a53d28
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Mon May 17 12:39:18 2021 +0200
inizialize() now create the balance row if it not exist yet
[33mcommit ddad4e31336bf6eefc2d37a34ca3c9c4c3262538[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Mon May 17 12:37:14 2021 +0200
inizialize() now create the balance row if it not exist yet
[33mcommit 3a53d28468e59db43c3a022361b8b8d4f9ec1bee[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 12:13:15 2021 +0200
remove unused code
[33mcommit bab1856dd1bfe24ec32b5e500634dc3188a32ad1[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 12:12:46 2021 +0200
inconsistencies are fixed hopefully
[33mcommit 42d4e042ff2b362472fb1f0dc844132544127789[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Mon May 17 11:54:20 2021 +0200
removed discountRate 2
[33mcommit 65fe7907fc77e52e3eca4864bf272863b1e60b05[m
Merge: f02aaa5 5a13072
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Mon May 17 11:49:17 2021 +0200
Merge branch 'phase_3' of git-softeng.polito.it:se-2021/group-12/ezshop into phase_3
[33mcommit f02aaa5cf8684af7c1de8a9409b5c262f44d27c3[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Mon May 17 11:49:02 2021 +0200
removed discount rate from productType
[33mcommit 5a1307258d33813ce9bdcdc02c9d0c12c16f53df[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 11:46:06 2021 +0200
remove unused code from main
[33mcommit 3aab598b6206bb1d95429be3b8273741cc5059d2[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 11:45:01 2021 +0200
change bitwise or to logical or
[33mcommit cb922c49457663c8ec5d2265cc4a18e8177d61cb[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 11:43:09 2021 +0200
remove db
[33mcommit dbfe362c1e5ebbc416e04a7b0cab475210b79f17[m
Merge: 2bcd7aa 72da3d5
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Mon May 17 11:11:57 2021 +0200
Merge branch 'phase_3' of git-softeng.polito.it:se-2021/group-12/ezshop into phase_3
[33mcommit 2bcd7aadf4789ba8aee8de3a2ca122a454941fd2[m
Merge: c1578c6 228c5db
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Mon May 17 11:11:39 2021 +0200
conflict resolved
[33mcommit 72da3d5c4e4ac488970abbab3051078c5a936ea9[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 11:10:51 2021 +0200
end return transaction
[33mcommit c1578c6b833f0a5d8abe33bc11bd641b08a54a88[m
Author: Eugenio Ressa <s281642@studenti.polito.it>
Date: Mon May 17 10:47:36 2021 +0200
FR4 & FR7
[33mcommit 228c5db428127ecab3e9a44ee13792942abe7744[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 02:42:00 2021 +0200
fix bug, return product works correctly
[33mcommit d384a70c687e8ddb9fb7501e4c080f6d56730ad2[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 01:28:06 2021 +0200
return product, needs to be tested
[33mcommit ec1d47958115a8d980d95ba03ff005030d74482c[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 01:03:45 2021 +0200
start return transaction
[33mcommit e6facf1c4bee7a40ac6c9b1bab2380da0e3300ec[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 00:51:56 2021 +0200
remove unused code
[33mcommit 7462cd9dd12cb10ea35d269b98473ebb908d6cb6[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Mon May 17 00:46:07 2021 +0200
add ticketNumber to return,
change structure in db,
start return transaction not complete yet
[33mcommit c3b0cad2dca592bad84a538c3022e954e53b1dbe[m
Merge: 4a3c187 e5f1688
Author: setareh askari <s288485@studenti.polito.it>
Date: Sun May 16 22:39:28 2021 +0200
resolve conflict
[33mcommit 4a3c187a40890964531fb6eb152566ebbbb36342[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sun May 16 22:38:19 2021 +0200
resolve conflict
[33mcommit e5f1688a1ea8139f4c77184a46a79b9822a9f77b[m
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Sun May 16 18:26:08 2021 +0200
FR7 everything except the function that writes Requirements.txt
[33mcommit a442f31bedbe52d7c716aa9878178a28c5a8442f[m
Merge: 2d04282 7ddc4c3
Author: DANIEL PEÑA LÓPEZ s286489 <s286489@studenti.polito.it>
Date: Sun May 16 12:29:14 2021 +0200
little changes
[33mcommit 7ddc4c31d0f164b7b6b2b702573a32919da73f67[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sun May 16 00:13:02 2021 +0200
fix bug in calculating price
[33mcommit 308f2f9780c68998f5e9dbec3bb6ef032c297dd0[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 15 23:52:42 2021 +0200
fix bug in printing ticket, set ticket for sales
[33mcommit 8859328859e0c15246024fe4ec777b6b6ca53738[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 15 23:22:03 2021 +0200
add logger
[33mcommit aa840eb00d471f0f09f42451ce6a2222d5d61407[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 15 22:43:44 2021 +0200
undo changes of return of endSaleTransaction
[33mcommit de715278e1857394397898897e7d04a64d9864d4[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 15 22:36:54 2021 +0200
add logger
[33mcommit 879d4af36e43c4b93bd4f3585021ba3980484e12[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 15 22:24:49 2021 +0200
fix #3
[33mcommit 364e64f8e8a101ed2aa87f25887909a1f7619f5a[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 15 22:23:43 2021 +0200
replace | with ||
[33mcommit 2d1a3176760695077d801366041212e6b36b108c[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 15 22:17:34 2021 +0200
fix logout bug
[33mcommit 9e3e0f3859bed9b0060be88387cc4b2a4607376f[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 15 19:41:26 2021 +0200
fix bug
[33mcommit 5506abda9cce2d75f0782a1f8f55006245579413[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 15 19:28:09 2021 +0200
delete sale transaction
[33mcommit c3381eee22be8c28a15444d276ad1be9aa25088a[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 15 19:08:15 2021 +0200
return closed sale transaction
[33mcommit 799ca20b256276bbf18f32bffa4357a34c2bcb44[m
Author: setareh askari <s288485@studenti.polito.it>
Date: Sat May 15 17:38:27 2021 +0200