Ver código fonte

Email changes

master
Kobus Botha 5 anos atrás
pai
commit
ec8cf9186f

+ 12
- 0
UnivateProperties_API/.config/dotnet-tools.json Ver arquivo

@@ -0,0 +1,12 @@
1
+{
2
+  "version": 1,
3
+  "isRoot": true,
4
+  "tools": {
5
+    "dotnet-ef": {
6
+      "version": "3.1.0",
7
+      "commands": [
8
+        "dotnet-ef"
9
+      ]
10
+    }
11
+  }
12
+}

+ 2
- 4
UnivateProperties_API/Migrations/20190904110840_Initial.cs Ver arquivo

@@ -497,14 +497,12 @@ namespace UnivateProperties_API.Migrations
497 497
                         name: "FK_Properties_Provinces_ProvinceId",
498 498
                         column: x => x.ProvinceId,
499 499
                         principalTable: "Provinces",
500
-                        principalColumn: "Id",
501
-                        onDelete: ReferentialAction.Cascade);
500
+                        principalColumn: "Id");
502 501
                     table.ForeignKey(
503 502
                         name: "FK_Properties_Suburbs_SuburbId",
504 503
                         column: x => x.SuburbId,
505 504
                         principalTable: "Suburbs",
506
-                        principalColumn: "Id",
507
-                        onDelete: ReferentialAction.Cascade);
505
+                        principalColumn: "Id");
508 506
                 });
509 507
 
510 508
             migrationBuilder.CreateTable(

+ 0
- 2
UnivateProperties_API/Migrations/20191014123718_Location_Templates2.Designer.cs Ver arquivo

@@ -970,8 +970,6 @@ namespace UnivateProperties_API.Migrations
970 970
 
971 971
                     b.HasKey("Id");
972 972
 
973
-                    b.HasIndex("Username")
974
-                        .IsUnique();
975 973
 
976 974
                     b.ToTable("Users");
977 975
                 });

+ 0
- 5
UnivateProperties_API/Migrations/20191014123820_Location_Templates.cs Ver arquivo

@@ -66,11 +66,6 @@ namespace UnivateProperties_API.Migrations
66 66
                         onDelete: ReferentialAction.Cascade);
67 67
                 });
68 68
 
69
-            migrationBuilder.CreateIndex(
70
-                name: "IX_Users_Username",
71
-                table: "Users",
72
-                column: "Username",
73
-                unique: true);
74 69
 
75 70
             //migrationBuilder.CreateIndex(
76 71
             //    name: "IX_Individuals_Telephone_CellNumber_Email",

+ 1329
- 0
UnivateProperties_API/Migrations/20200107112926_test.Designer.cs
Diferenças do arquivo suprimidas por serem muito extensas
Ver arquivo


+ 549
- 0
UnivateProperties_API/Migrations/20200107112926_test.cs Ver arquivo

@@ -0,0 +1,549 @@
1
+using Microsoft.EntityFrameworkCore.Metadata;
2
+using Microsoft.EntityFrameworkCore.Migrations;
3
+
4
+namespace UnivateProperties_API.Migrations
5
+{
6
+    public partial class test : Migration
7
+    {
8
+        protected override void Up(MigrationBuilder migrationBuilder)
9
+        {
10
+            migrationBuilder.DropForeignKey(
11
+                name: "FK_UnitConfigurationTypes_UnitConfigurations_UnitConfiguration~",
12
+                table: "UnitConfigurationTypes");
13
+
14
+            migrationBuilder.DropIndex(
15
+                name: "IX_Users_Username",
16
+                table: "Users");
17
+
18
+            migrationBuilder.DropIndex(
19
+                name: "IX_UnitConfigurations_Code",
20
+                table: "UnitConfigurations");
21
+
22
+            migrationBuilder.DropIndex(
23
+                name: "IX_Individuals_Telephone_CellNumber_Email",
24
+                table: "Individuals");
25
+
26
+            migrationBuilder.AlterColumn<int>(
27
+                name: "Id",
28
+                table: "Weeks",
29
+                nullable: false,
30
+                oldClrType: typeof(int))
31
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
32
+
33
+            migrationBuilder.AlterColumn<int>(
34
+                name: "Id",
35
+                table: "Users",
36
+                nullable: false,
37
+                oldClrType: typeof(int))
38
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
39
+
40
+            migrationBuilder.AlterColumn<int>(
41
+                name: "Id",
42
+                table: "UserDefinedGroups",
43
+                nullable: false,
44
+                oldClrType: typeof(int))
45
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
46
+
47
+            migrationBuilder.AlterColumn<int>(
48
+                name: "Id",
49
+                table: "UserDefinedFields",
50
+                nullable: false,
51
+                oldClrType: typeof(int))
52
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
53
+
54
+            migrationBuilder.AlterColumn<int>(
55
+                name: "Id",
56
+                table: "UnitConfigurationTypes",
57
+                nullable: false,
58
+                oldClrType: typeof(int))
59
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
60
+
61
+            migrationBuilder.AlterColumn<int>(
62
+                name: "Id",
63
+                table: "UnitConfigurations",
64
+                nullable: false,
65
+                oldClrType: typeof(int))
66
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
67
+
68
+            migrationBuilder.AlterColumn<int>(
69
+                name: "Id",
70
+                table: "Templates",
71
+                nullable: false,
72
+                oldClrType: typeof(int))
73
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
74
+
75
+            migrationBuilder.AlterColumn<int>(
76
+                name: "Id",
77
+                table: "Suburbs",
78
+                nullable: false,
79
+                oldClrType: typeof(int))
80
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
81
+
82
+            migrationBuilder.AlterColumn<int>(
83
+                name: "Id",
84
+                table: "Status",
85
+                nullable: false,
86
+                oldClrType: typeof(int))
87
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
88
+
89
+            migrationBuilder.AlterColumn<int>(
90
+                name: "Id",
91
+                table: "Seasons",
92
+                nullable: false,
93
+                oldClrType: typeof(int))
94
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
95
+
96
+            migrationBuilder.AlterColumn<int>(
97
+                name: "Id",
98
+                table: "SearchLogs",
99
+                nullable: false,
100
+                oldClrType: typeof(int))
101
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
102
+
103
+            migrationBuilder.AlterColumn<int>(
104
+                name: "Id",
105
+                table: "Provinces",
106
+                nullable: false,
107
+                oldClrType: typeof(int))
108
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
109
+
110
+            migrationBuilder.AlterColumn<int>(
111
+                name: "Id",
112
+                table: "PropertyUserFields",
113
+                nullable: false,
114
+                oldClrType: typeof(int))
115
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
116
+
117
+            migrationBuilder.AlterColumn<int>(
118
+                name: "Id",
119
+                table: "PropertyTypes",
120
+                nullable: false,
121
+                oldClrType: typeof(int))
122
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
123
+
124
+            migrationBuilder.AlterColumn<int>(
125
+                name: "Id",
126
+                table: "PropertyImages",
127
+                nullable: false,
128
+                oldClrType: typeof(int))
129
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
130
+
131
+            migrationBuilder.AlterColumn<int>(
132
+                name: "Id",
133
+                table: "Properties",
134
+                nullable: false,
135
+                oldClrType: typeof(int))
136
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
137
+
138
+            migrationBuilder.AlterColumn<int>(
139
+                name: "Id",
140
+                table: "ProcessFlows",
141
+                nullable: false,
142
+                oldClrType: typeof(int))
143
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
144
+
145
+            migrationBuilder.AlterColumn<int>(
146
+                name: "Id",
147
+                table: "PlaceHolders",
148
+                nullable: false,
149
+                oldClrType: typeof(int))
150
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
151
+
152
+            migrationBuilder.AlterColumn<int>(
153
+                name: "Id",
154
+                table: "Person",
155
+                nullable: false,
156
+                oldClrType: typeof(int))
157
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
158
+
159
+            migrationBuilder.AlterColumn<int>(
160
+                name: "Id",
161
+                table: "Location",
162
+                nullable: false,
163
+                oldClrType: typeof(int))
164
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
165
+
166
+            migrationBuilder.AlterColumn<int>(
167
+                name: "Id",
168
+                table: "Individuals",
169
+                nullable: false,
170
+                oldClrType: typeof(int))
171
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
172
+
173
+            migrationBuilder.AlterColumn<int>(
174
+                name: "Id",
175
+                table: "Hosts",
176
+                nullable: false,
177
+                oldClrType: typeof(int))
178
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
179
+
180
+            migrationBuilder.AlterColumn<int>(
181
+                name: "Id",
182
+                table: "Emails",
183
+                nullable: false,
184
+                oldClrType: typeof(int))
185
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
186
+
187
+            migrationBuilder.AlterColumn<int>(
188
+                name: "Id",
189
+                table: "Cities",
190
+                nullable: false,
191
+                oldClrType: typeof(int))
192
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
193
+
194
+            migrationBuilder.AlterColumn<int>(
195
+                name: "Id",
196
+                table: "Carousel",
197
+                nullable: false,
198
+                oldClrType: typeof(int))
199
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
200
+
201
+            migrationBuilder.AlterColumn<int>(
202
+                name: "Id",
203
+                table: "BidItems",
204
+                nullable: false,
205
+                oldClrType: typeof(int))
206
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
207
+
208
+            migrationBuilder.AlterColumn<int>(
209
+                name: "Id",
210
+                table: "Banks",
211
+                nullable: false,
212
+                oldClrType: typeof(int))
213
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
214
+
215
+            migrationBuilder.AlterColumn<int>(
216
+                name: "Id",
217
+                table: "BankAccounts",
218
+                nullable: false,
219
+                oldClrType: typeof(int))
220
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
221
+
222
+            migrationBuilder.AlterColumn<int>(
223
+                name: "Id",
224
+                table: "Agents",
225
+                nullable: false,
226
+                oldClrType: typeof(int))
227
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
228
+
229
+            migrationBuilder.AlterColumn<int>(
230
+                name: "Id",
231
+                table: "Agencies",
232
+                nullable: false,
233
+                oldClrType: typeof(int))
234
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
235
+
236
+            migrationBuilder.AlterColumn<int>(
237
+                name: "Id",
238
+                table: "Addresses",
239
+                nullable: false,
240
+                oldClrType: typeof(int))
241
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
242
+
243
+            migrationBuilder.AlterColumn<int>(
244
+                name: "Id",
245
+                table: "Accounts",
246
+                nullable: false,
247
+                oldClrType: typeof(int))
248
+                .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
249
+
250
+            migrationBuilder.CreateIndex(
251
+                name: "IX_Users_Username",
252
+                table: "Users",
253
+                column: "Username",
254
+                unique: true,
255
+                filter: "[Username] IS NOT NULL");
256
+
257
+            migrationBuilder.CreateIndex(
258
+                name: "IX_UnitConfigurations_Code",
259
+                table: "UnitConfigurations",
260
+                column: "Code",
261
+                unique: true,
262
+                filter: "[Code] IS NOT NULL");
263
+
264
+            migrationBuilder.CreateIndex(
265
+                name: "IX_Individuals_Telephone_CellNumber_Email",
266
+                table: "Individuals",
267
+                columns: new[] { "Telephone", "CellNumber", "Email" },
268
+                unique: true,
269
+                filter: "[Telephone] IS NOT NULL AND [CellNumber] IS NOT NULL AND [Email] IS NOT NULL");
270
+
271
+            migrationBuilder.AddForeignKey(
272
+                name: "FK_UnitConfigurationTypes_UnitConfigurations_UnitConfigurationId",
273
+                table: "UnitConfigurationTypes",
274
+                column: "UnitConfigurationId",
275
+                principalTable: "UnitConfigurations",
276
+                principalColumn: "Id",
277
+                onDelete: ReferentialAction.Cascade);
278
+        }
279
+
280
+        protected override void Down(MigrationBuilder migrationBuilder)
281
+        {
282
+            migrationBuilder.DropForeignKey(
283
+                name: "FK_UnitConfigurationTypes_UnitConfigurations_UnitConfigurationId",
284
+                table: "UnitConfigurationTypes");
285
+
286
+            migrationBuilder.DropIndex(
287
+                name: "IX_Users_Username",
288
+                table: "Users");
289
+
290
+            migrationBuilder.DropIndex(
291
+                name: "IX_UnitConfigurations_Code",
292
+                table: "UnitConfigurations");
293
+
294
+            migrationBuilder.DropIndex(
295
+                name: "IX_Individuals_Telephone_CellNumber_Email",
296
+                table: "Individuals");
297
+
298
+            migrationBuilder.AlterColumn<int>(
299
+                name: "Id",
300
+                table: "Weeks",
301
+                nullable: false,
302
+                oldClrType: typeof(int))
303
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
304
+
305
+            migrationBuilder.AlterColumn<int>(
306
+                name: "Id",
307
+                table: "Users",
308
+                nullable: false,
309
+                oldClrType: typeof(int))
310
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
311
+
312
+            migrationBuilder.AlterColumn<int>(
313
+                name: "Id",
314
+                table: "UserDefinedGroups",
315
+                nullable: false,
316
+                oldClrType: typeof(int))
317
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
318
+
319
+            migrationBuilder.AlterColumn<int>(
320
+                name: "Id",
321
+                table: "UserDefinedFields",
322
+                nullable: false,
323
+                oldClrType: typeof(int))
324
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
325
+
326
+            migrationBuilder.AlterColumn<int>(
327
+                name: "Id",
328
+                table: "UnitConfigurationTypes",
329
+                nullable: false,
330
+                oldClrType: typeof(int))
331
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
332
+
333
+            migrationBuilder.AlterColumn<int>(
334
+                name: "Id",
335
+                table: "UnitConfigurations",
336
+                nullable: false,
337
+                oldClrType: typeof(int))
338
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
339
+
340
+            migrationBuilder.AlterColumn<int>(
341
+                name: "Id",
342
+                table: "Templates",
343
+                nullable: false,
344
+                oldClrType: typeof(int))
345
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
346
+
347
+            migrationBuilder.AlterColumn<int>(
348
+                name: "Id",
349
+                table: "Suburbs",
350
+                nullable: false,
351
+                oldClrType: typeof(int))
352
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
353
+
354
+            migrationBuilder.AlterColumn<int>(
355
+                name: "Id",
356
+                table: "Status",
357
+                nullable: false,
358
+                oldClrType: typeof(int))
359
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
360
+
361
+            migrationBuilder.AlterColumn<int>(
362
+                name: "Id",
363
+                table: "Seasons",
364
+                nullable: false,
365
+                oldClrType: typeof(int))
366
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
367
+
368
+            migrationBuilder.AlterColumn<int>(
369
+                name: "Id",
370
+                table: "SearchLogs",
371
+                nullable: false,
372
+                oldClrType: typeof(int))
373
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
374
+
375
+            migrationBuilder.AlterColumn<int>(
376
+                name: "Id",
377
+                table: "Provinces",
378
+                nullable: false,
379
+                oldClrType: typeof(int))
380
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
381
+
382
+            migrationBuilder.AlterColumn<int>(
383
+                name: "Id",
384
+                table: "PropertyUserFields",
385
+                nullable: false,
386
+                oldClrType: typeof(int))
387
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
388
+
389
+            migrationBuilder.AlterColumn<int>(
390
+                name: "Id",
391
+                table: "PropertyTypes",
392
+                nullable: false,
393
+                oldClrType: typeof(int))
394
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
395
+
396
+            migrationBuilder.AlterColumn<int>(
397
+                name: "Id",
398
+                table: "PropertyImages",
399
+                nullable: false,
400
+                oldClrType: typeof(int))
401
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
402
+
403
+            migrationBuilder.AlterColumn<int>(
404
+                name: "Id",
405
+                table: "Properties",
406
+                nullable: false,
407
+                oldClrType: typeof(int))
408
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
409
+
410
+            migrationBuilder.AlterColumn<int>(
411
+                name: "Id",
412
+                table: "ProcessFlows",
413
+                nullable: false,
414
+                oldClrType: typeof(int))
415
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
416
+
417
+            migrationBuilder.AlterColumn<int>(
418
+                name: "Id",
419
+                table: "PlaceHolders",
420
+                nullable: false,
421
+                oldClrType: typeof(int))
422
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
423
+
424
+            migrationBuilder.AlterColumn<int>(
425
+                name: "Id",
426
+                table: "Person",
427
+                nullable: false,
428
+                oldClrType: typeof(int))
429
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
430
+
431
+            migrationBuilder.AlterColumn<int>(
432
+                name: "Id",
433
+                table: "Location",
434
+                nullable: false,
435
+                oldClrType: typeof(int))
436
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
437
+
438
+            migrationBuilder.AlterColumn<int>(
439
+                name: "Id",
440
+                table: "Individuals",
441
+                nullable: false,
442
+                oldClrType: typeof(int))
443
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
444
+
445
+            migrationBuilder.AlterColumn<int>(
446
+                name: "Id",
447
+                table: "Hosts",
448
+                nullable: false,
449
+                oldClrType: typeof(int))
450
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
451
+
452
+            migrationBuilder.AlterColumn<int>(
453
+                name: "Id",
454
+                table: "Emails",
455
+                nullable: false,
456
+                oldClrType: typeof(int))
457
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
458
+
459
+            migrationBuilder.AlterColumn<int>(
460
+                name: "Id",
461
+                table: "Cities",
462
+                nullable: false,
463
+                oldClrType: typeof(int))
464
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
465
+
466
+            migrationBuilder.AlterColumn<int>(
467
+                name: "Id",
468
+                table: "Carousel",
469
+                nullable: false,
470
+                oldClrType: typeof(int))
471
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
472
+
473
+            migrationBuilder.AlterColumn<int>(
474
+                name: "Id",
475
+                table: "BidItems",
476
+                nullable: false,
477
+                oldClrType: typeof(int))
478
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
479
+
480
+            migrationBuilder.AlterColumn<int>(
481
+                name: "Id",
482
+                table: "Banks",
483
+                nullable: false,
484
+                oldClrType: typeof(int))
485
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
486
+
487
+            migrationBuilder.AlterColumn<int>(
488
+                name: "Id",
489
+                table: "BankAccounts",
490
+                nullable: false,
491
+                oldClrType: typeof(int))
492
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
493
+
494
+            migrationBuilder.AlterColumn<int>(
495
+                name: "Id",
496
+                table: "Agents",
497
+                nullable: false,
498
+                oldClrType: typeof(int))
499
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
500
+
501
+            migrationBuilder.AlterColumn<int>(
502
+                name: "Id",
503
+                table: "Agencies",
504
+                nullable: false,
505
+                oldClrType: typeof(int))
506
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
507
+
508
+            migrationBuilder.AlterColumn<int>(
509
+                name: "Id",
510
+                table: "Addresses",
511
+                nullable: false,
512
+                oldClrType: typeof(int))
513
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
514
+
515
+            migrationBuilder.AlterColumn<int>(
516
+                name: "Id",
517
+                table: "Accounts",
518
+                nullable: false,
519
+                oldClrType: typeof(int))
520
+                .OldAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
521
+
522
+            migrationBuilder.CreateIndex(
523
+                name: "IX_Users_Username",
524
+                table: "Users",
525
+                column: "Username",
526
+                unique: true);
527
+
528
+            migrationBuilder.CreateIndex(
529
+                name: "IX_UnitConfigurations_Code",
530
+                table: "UnitConfigurations",
531
+                column: "Code",
532
+                unique: true);
533
+
534
+            migrationBuilder.CreateIndex(
535
+                name: "IX_Individuals_Telephone_CellNumber_Email",
536
+                table: "Individuals",
537
+                columns: new[] { "Telephone", "CellNumber", "Email" },
538
+                unique: true);
539
+
540
+            migrationBuilder.AddForeignKey(
541
+                name: "FK_UnitConfigurationTypes_UnitConfigurations_UnitConfiguration~",
542
+                table: "UnitConfigurationTypes",
543
+                column: "UnitConfigurationId",
544
+                principalTable: "UnitConfigurations",
545
+                principalColumn: "Id",
546
+                onDelete: ReferentialAction.Cascade);
547
+        }
548
+    }
549
+}

+ 74
- 39
UnivateProperties_API/Migrations/DataContextModelSnapshot.cs Ver arquivo

@@ -2,8 +2,8 @@
2 2
 using System;
3 3
 using Microsoft.EntityFrameworkCore;
4 4
 using Microsoft.EntityFrameworkCore.Infrastructure;
5
+using Microsoft.EntityFrameworkCore.Metadata;
5 6
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
6
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
7 7
 using UnivateProperties_API.Context;
8 8
 
9 9
 namespace UnivateProperties_API.Migrations
@@ -15,14 +15,15 @@ namespace UnivateProperties_API.Migrations
15 15
         {
16 16
 #pragma warning disable 612, 618
17 17
             modelBuilder
18
-                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
19 18
                 .HasAnnotation("ProductVersion", "2.2.6-servicing-10079")
20
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
19
+                .HasAnnotation("Relational:MaxIdentifierLength", 128)
20
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
21 21
 
22 22
             modelBuilder.Entity("UnivateProperties_API.Model.Banks.Bank", b =>
23 23
                 {
24 24
                     b.Property<int>("Id")
25
-                        .ValueGeneratedOnAdd();
25
+                        .ValueGeneratedOnAdd()
26
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
26 27
 
27 28
                     b.Property<DateTime>("Created");
28 29
 
@@ -44,7 +45,8 @@ namespace UnivateProperties_API.Migrations
44 45
             modelBuilder.Entity("UnivateProperties_API.Model.Banks.BankAccount", b =>
45 46
                 {
46 47
                     b.Property<int>("Id")
47
-                        .ValueGeneratedOnAdd();
48
+                        .ValueGeneratedOnAdd()
49
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
48 50
 
49 51
                     b.Property<string>("AccountHolder");
50 52
 
@@ -74,7 +76,8 @@ namespace UnivateProperties_API.Migrations
74 76
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.Email", b =>
75 77
                 {
76 78
                     b.Property<int>("Id")
77
-                        .ValueGeneratedOnAdd();
79
+                        .ValueGeneratedOnAdd()
80
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
78 81
 
79 82
                     b.Property<string>("BCC");
80 83
 
@@ -112,7 +115,8 @@ namespace UnivateProperties_API.Migrations
112 115
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.PlaceHolder", b =>
113 116
                 {
114 117
                     b.Property<int>("Id")
115
-                        .ValueGeneratedOnAdd();
118
+                        .ValueGeneratedOnAdd()
119
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
116 120
 
117 121
                     b.Property<string>("BoundTo");
118 122
 
@@ -142,7 +146,8 @@ namespace UnivateProperties_API.Migrations
142 146
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.SMTPAccount", b =>
143 147
                 {
144 148
                     b.Property<int>("Id")
145
-                        .ValueGeneratedOnAdd();
149
+                        .ValueGeneratedOnAdd()
150
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
146 151
 
147 152
                     b.Property<string>("Address");
148 153
 
@@ -170,7 +175,8 @@ namespace UnivateProperties_API.Migrations
170 175
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.SMTPHost", b =>
171 176
                 {
172 177
                     b.Property<int>("Id")
173
-                        .ValueGeneratedOnAdd();
178
+                        .ValueGeneratedOnAdd()
179
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
174 180
 
175 181
                     b.Property<DateTime>("Created");
176 182
 
@@ -198,7 +204,8 @@ namespace UnivateProperties_API.Migrations
198 204
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.Template", b =>
199 205
                 {
200 206
                     b.Property<int>("Id")
201
-                        .ValueGeneratedOnAdd();
207
+                        .ValueGeneratedOnAdd()
208
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
202 209
 
203 210
                     b.Property<string>("Body");
204 211
 
@@ -226,7 +233,8 @@ namespace UnivateProperties_API.Migrations
226 233
             modelBuilder.Entity("UnivateProperties_API.Model.Logging.SearchLog", b =>
227 234
                 {
228 235
                     b.Property<int>("Id")
229
-                        .ValueGeneratedOnAdd();
236
+                        .ValueGeneratedOnAdd()
237
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
230 238
 
231 239
                     b.Property<DateTime>("Created");
232 240
 
@@ -248,7 +256,8 @@ namespace UnivateProperties_API.Migrations
248 256
             modelBuilder.Entity("UnivateProperties_API.Model.Misc.Address", b =>
249 257
                 {
250 258
                     b.Property<int>("Id")
251
-                        .ValueGeneratedOnAdd();
259
+                        .ValueGeneratedOnAdd()
260
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
252 261
 
253 262
                     b.Property<string>("City");
254 263
 
@@ -280,7 +289,8 @@ namespace UnivateProperties_API.Migrations
280 289
             modelBuilder.Entity("UnivateProperties_API.Model.Misc.Carousel", b =>
281 290
                 {
282 291
                     b.Property<int>("Id")
283
-                        .ValueGeneratedOnAdd();
292
+                        .ValueGeneratedOnAdd()
293
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
284 294
 
285 295
                     b.Property<DateTime>("Created");
286 296
 
@@ -306,7 +316,8 @@ namespace UnivateProperties_API.Migrations
306 316
             modelBuilder.Entity("UnivateProperties_API.Model.Misc.Location", b =>
307 317
                 {
308 318
                     b.Property<int>("Id")
309
-                        .ValueGeneratedOnAdd();
319
+                        .ValueGeneratedOnAdd()
320
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
310 321
 
311 322
                     b.Property<DateTime>("Created");
312 323
 
@@ -328,7 +339,8 @@ namespace UnivateProperties_API.Migrations
328 339
             modelBuilder.Entity("UnivateProperties_API.Model.ProcessFlow.BidItem", b =>
329 340
                 {
330 341
                     b.Property<int>("Id")
331
-                        .ValueGeneratedOnAdd();
342
+                        .ValueGeneratedOnAdd()
343
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
332 344
 
333 345
                     b.Property<double>("Amount");
334 346
 
@@ -368,7 +380,8 @@ namespace UnivateProperties_API.Migrations
368 380
             modelBuilder.Entity("UnivateProperties_API.Model.ProcessFlow.ProcessFlow", b =>
369 381
                 {
370 382
                     b.Property<int>("Id")
371
-                        .ValueGeneratedOnAdd();
383
+                        .ValueGeneratedOnAdd()
384
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
372 385
 
373 386
                     b.Property<DateTime>("Created");
374 387
 
@@ -398,7 +411,8 @@ namespace UnivateProperties_API.Migrations
398 411
             modelBuilder.Entity("UnivateProperties_API.Model.Properties.Property", b =>
399 412
                 {
400 413
                     b.Property<int>("Id")
401
-                        .ValueGeneratedOnAdd();
414
+                        .ValueGeneratedOnAdd()
415
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
402 416
 
403 417
                     b.Property<string>("AddressLine1");
404 418
 
@@ -476,7 +490,8 @@ namespace UnivateProperties_API.Migrations
476 490
             modelBuilder.Entity("UnivateProperties_API.Model.Properties.PropertyImage", b =>
477 491
                 {
478 492
                     b.Property<int>("Id")
479
-                        .ValueGeneratedOnAdd();
493
+                        .ValueGeneratedOnAdd()
494
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
480 495
 
481 496
                     b.Property<DateTime>("Created");
482 497
 
@@ -502,7 +517,8 @@ namespace UnivateProperties_API.Migrations
502 517
             modelBuilder.Entity("UnivateProperties_API.Model.Properties.PropertyType", b =>
503 518
                 {
504 519
                     b.Property<int>("Id")
505
-                        .ValueGeneratedOnAdd();
520
+                        .ValueGeneratedOnAdd()
521
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
506 522
 
507 523
                     b.Property<DateTime>("Created");
508 524
 
@@ -524,7 +540,8 @@ namespace UnivateProperties_API.Migrations
524 540
             modelBuilder.Entity("UnivateProperties_API.Model.Properties.PropertyUserField", b =>
525 541
                 {
526 542
                     b.Property<int>("Id")
527
-                        .ValueGeneratedOnAdd();
543
+                        .ValueGeneratedOnAdd()
544
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
528 545
 
529 546
                     b.Property<DateTime>("Created");
530 547
 
@@ -554,7 +571,8 @@ namespace UnivateProperties_API.Migrations
554 571
             modelBuilder.Entity("UnivateProperties_API.Model.Properties.UserDefinedField", b =>
555 572
                 {
556 573
                     b.Property<int>("Id")
557
-                        .ValueGeneratedOnAdd();
574
+                        .ValueGeneratedOnAdd()
575
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
558 576
 
559 577
                     b.Property<DateTime>("Created");
560 578
 
@@ -582,7 +600,8 @@ namespace UnivateProperties_API.Migrations
582 600
             modelBuilder.Entity("UnivateProperties_API.Model.Properties.UserDefinedGroup", b =>
583 601
                 {
584 602
                     b.Property<int>("Id")
585
-                        .ValueGeneratedOnAdd();
603
+                        .ValueGeneratedOnAdd()
604
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
586 605
 
587 606
                     b.Property<DateTime>("Created");
588 607
 
@@ -606,7 +625,8 @@ namespace UnivateProperties_API.Migrations
606 625
             modelBuilder.Entity("UnivateProperties_API.Model.Region.City", b =>
607 626
                 {
608 627
                     b.Property<int>("Id")
609
-                        .ValueGeneratedOnAdd();
628
+                        .ValueGeneratedOnAdd()
629
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
610 630
 
611 631
                     b.Property<string>("Code");
612 632
 
@@ -632,7 +652,8 @@ namespace UnivateProperties_API.Migrations
632 652
             modelBuilder.Entity("UnivateProperties_API.Model.Region.Province", b =>
633 653
                 {
634 654
                     b.Property<int>("Id")
635
-                        .ValueGeneratedOnAdd();
655
+                        .ValueGeneratedOnAdd()
656
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
636 657
 
637 658
                     b.Property<string>("Code");
638 659
 
@@ -654,7 +675,8 @@ namespace UnivateProperties_API.Migrations
654 675
             modelBuilder.Entity("UnivateProperties_API.Model.Region.Suburb", b =>
655 676
                 {
656 677
                     b.Property<int>("Id")
657
-                        .ValueGeneratedOnAdd();
678
+                        .ValueGeneratedOnAdd()
679
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
658 680
 
659 681
                     b.Property<int>("CityId");
660 682
 
@@ -680,7 +702,8 @@ namespace UnivateProperties_API.Migrations
680 702
             modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.Season", b =>
681 703
                 {
682 704
                     b.Property<int>("Id")
683
-                        .ValueGeneratedOnAdd();
705
+                        .ValueGeneratedOnAdd()
706
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
684 707
 
685 708
                     b.Property<DateTime>("Created");
686 709
 
@@ -700,7 +723,8 @@ namespace UnivateProperties_API.Migrations
700 723
             modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.Status", b =>
701 724
                 {
702 725
                     b.Property<int>("Id")
703
-                        .ValueGeneratedOnAdd();
726
+                        .ValueGeneratedOnAdd()
727
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
704 728
 
705 729
                     b.Property<string>("Code");
706 730
 
@@ -724,7 +748,8 @@ namespace UnivateProperties_API.Migrations
724 748
             modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.TimeshareWeek", b =>
725 749
                 {
726 750
                     b.Property<int>("Id")
727
-                        .ValueGeneratedOnAdd();
751
+                        .ValueGeneratedOnAdd()
752
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
728 753
 
729 754
                     b.Property<int?>("AgencyId");
730 755
 
@@ -810,7 +835,8 @@ namespace UnivateProperties_API.Migrations
810 835
             modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.UnitConfiguration", b =>
811 836
                 {
812 837
                     b.Property<int>("Id")
813
-                        .ValueGeneratedOnAdd();
838
+                        .ValueGeneratedOnAdd()
839
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
814 840
 
815 841
                     b.Property<int>("Adults");
816 842
 
@@ -831,7 +857,8 @@ namespace UnivateProperties_API.Migrations
831 857
                     b.HasKey("Id");
832 858
 
833 859
                     b.HasIndex("Code")
834
-                        .IsUnique();
860
+                        .IsUnique()
861
+                        .HasFilter("[Code] IS NOT NULL");
835 862
 
836 863
                     b.ToTable("UnitConfigurations");
837 864
                 });
@@ -839,7 +866,8 @@ namespace UnivateProperties_API.Migrations
839 866
             modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.UnitConfigurationType", b =>
840 867
                 {
841 868
                     b.Property<int>("Id")
842
-                        .ValueGeneratedOnAdd();
869
+                        .ValueGeneratedOnAdd()
870
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
843 871
 
844 872
                     b.Property<DateTime>("Created");
845 873
 
@@ -863,7 +891,8 @@ namespace UnivateProperties_API.Migrations
863 891
             modelBuilder.Entity("UnivateProperties_API.Model.Users.Agency", b =>
864 892
                 {
865 893
                     b.Property<int>("Id")
866
-                        .ValueGeneratedOnAdd();
894
+                        .ValueGeneratedOnAdd()
895
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
867 896
 
868 897
                     b.Property<string>("AgencyName");
869 898
 
@@ -887,7 +916,8 @@ namespace UnivateProperties_API.Migrations
887 916
             modelBuilder.Entity("UnivateProperties_API.Model.Users.Agent", b =>
888 917
                 {
889 918
                     b.Property<int>("Id")
890
-                        .ValueGeneratedOnAdd();
919
+                        .ValueGeneratedOnAdd()
920
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
891 921
 
892 922
                     b.Property<int?>("AgencyId");
893 923
 
@@ -927,7 +957,8 @@ namespace UnivateProperties_API.Migrations
927 957
             modelBuilder.Entity("UnivateProperties_API.Model.Users.Individual", b =>
928 958
                 {
929 959
                     b.Property<int>("Id")
930
-                        .ValueGeneratedOnAdd();
960
+                        .ValueGeneratedOnAdd()
961
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
931 962
 
932 963
                     b.Property<int?>("AddressId");
933 964
 
@@ -974,7 +1005,8 @@ namespace UnivateProperties_API.Migrations
974 1005
                     b.HasIndex("UserId");
975 1006
 
976 1007
                     b.HasIndex("Telephone", "CellNumber", "Email")
977
-                        .IsUnique();
1008
+                        .IsUnique()
1009
+                        .HasFilter("[Telephone] IS NOT NULL AND [CellNumber] IS NOT NULL AND [Email] IS NOT NULL");
978 1010
 
979 1011
                     b.ToTable("Individuals");
980 1012
                 });
@@ -982,7 +1014,8 @@ namespace UnivateProperties_API.Migrations
982 1014
             modelBuilder.Entity("UnivateProperties_API.Model.Users.Person", b =>
983 1015
                 {
984 1016
                     b.Property<int>("Id")
985
-                        .ValueGeneratedOnAdd();
1017
+                        .ValueGeneratedOnAdd()
1018
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
986 1019
 
987 1020
                     b.Property<string>("CellNumber");
988 1021
 
@@ -1014,7 +1047,8 @@ namespace UnivateProperties_API.Migrations
1014 1047
             modelBuilder.Entity("UnivateProperties_API.Model.Users.User", b =>
1015 1048
                 {
1016 1049
                     b.Property<int>("Id")
1017
-                        .ValueGeneratedOnAdd();
1050
+                        .ValueGeneratedOnAdd()
1051
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
1018 1052
 
1019 1053
                     b.Property<DateTime>("Created");
1020 1054
 
@@ -1039,7 +1073,8 @@ namespace UnivateProperties_API.Migrations
1039 1073
                     b.HasKey("Id");
1040 1074
 
1041 1075
                     b.HasIndex("Username")
1042
-                        .IsUnique();
1076
+                        .IsUnique()
1077
+                        .HasFilter("[Username] IS NOT NULL");
1043 1078
 
1044 1079
                     b.ToTable("Users");
1045 1080
                 });
@@ -1082,7 +1117,7 @@ namespace UnivateProperties_API.Migrations
1082 1117
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.Template", b =>
1083 1118
                 {
1084 1119
                     b.HasOne("UnivateProperties_API.Model.Communication.SMTPAccount", "Sender")
1085
-                        .WithMany()
1120
+                        .WithMany("Templates")
1086 1121
                         .HasForeignKey("SenderId");
1087 1122
                 });
1088 1123
 

+ 12
- 9
UnivateProperties_API/Model/Communication/Email.cs Ver arquivo

@@ -53,18 +53,21 @@ namespace UnivateProperties_API.Model.Communication
53 53
                 {
54 54
                     foreach(var obj in args)
55 55
                     {
56
-                        if(obj.GetType() == Type.GetType(item.BoundToClass))
56
+                        if(obj != null)
57 57
                         {
58
-                            string replaceValue = (string)obj[item.BoundTo];
59
-                            if(Body.Contains(item.Name))
58
+                            if (obj.GetType() == Type.GetType(item.BoundToClass) || obj.GetType().IsSubclassOf(Type.GetType(item.BoundToClass)))
60 59
                             {
61
-                                Body = Body.Replace(item.Name, replaceValue);
60
+                                string replaceValue = (string)obj[item.BoundTo];
61
+                                if (Body.Contains(item.Name))
62
+                                {
63
+                                    Body = Body.Replace(item.Name, replaceValue);
64
+                                }
65
+                                if (Subject.Contains(item.Name))
66
+                                {
67
+                                    Subject = Subject.Replace(item.Name, replaceValue);
68
+                                }
62 69
                             }
63
-                            if(Subject.Contains(item.Name))
64
-                            {
65
-                                Subject = Subject.Replace(item.Name, replaceValue);
66
-                            }
67
-                        }
70
+                        }                        
68 71
                     }
69 72
                 }
70 73
             }

+ 2
- 1
UnivateProperties_API/Repository/Timeshare/WeekRepository.cs Ver arquivo

@@ -407,6 +407,7 @@ namespace UnivateProperties_API.Repository.Timeshare
407 407
             var newStatus = _dbContext.Status.FirstOrDefault(x => x.Code.ToLower() == "a2" && x.StatusType == StatusType.Timeshare);
408 408
             if(week != null && newStatus != null)
409 409
             {
410
+                week = GetDetailedWeek(week);
410 411
                 week.Status = newStatus;
411 412
                 Update(week);
412 413
                 var template = _dbContext.Templates.Where(x => x.Name == "WeekAuthorized").FirstOrDefault();
@@ -414,7 +415,7 @@ namespace UnivateProperties_API.Repository.Timeshare
414 415
                 {
415 416
                     
416 417
                     TemplateRepository tempRepo = new TemplateRepository(_dbContext);
417
-                    tempRepo.SendEmailTemplate(template, week.Owner, new List<BaseEntity>() { week, week.Owner});
418
+                    tempRepo.SendEmailTemplate(template, week.Owner, new List<BaseEntity>() { week, week.Owner, week.Owner.User});
418 419
                 }
419 420
             }
420 421
         }

Carregando…
Cancelar
Salvar