Commit8b3f079

authored

Merge pull request#241 from Resgrid/develop

CU-8687aj3gt Trying to fix User Push reg issue.

2 parents0ea711e +5312ac7 commit8b3f079Copy full SHA for 8b3f079

File tree

+10

-19

lines changed

+10

-19

lines changed

Lines changed: 2 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ namespace Resgrid.Model`
`12`	`12`	`[Table("PushUris")]`
`13`	`13`	`publicclassPushUri:IEntity`
`14`	`14`	`{`
`15`		`-privatestring_pushLocation;`
`16`		`-`
`17`	`15`	`[Key]`
`18`	`16`	`[Required]`
`19`	`17`	`[DatabaseGenerated(DatabaseGeneratedOption.Identity)]`
`@@ -36,20 +34,8 @@ public class PushUri : IEntity`
`36`	`34`	`publicstringDeviceId{get;set;}`
`37`	`35`
`38`	`36`	`[Required]`
`39`		`-publicstringPushLocation`
`40`		`-{`
`41`		`-get{return_pushLocation;}`
`42`		`-set`
`43`		`-{`
`44`		`-if(_pushLocation!=value)`
`45`		`-{`
`46`		`-_pushLocation=value;`
`47`		`-`
`48`		`-//if (((Platforms)PlatformType) == Platforms.Windows8 \|\| ((Platforms)PlatformType) == Platforms.WindowsPhone7 \|\| ((Platforms)PlatformType) == Platforms.WindowsPhone8 \|\| ((Platforms)PlatformType) == Platforms.UnitWin)`
`49`		`-//ChannelUri = new Uri(_pushLocation, UriKind.Absolute);`
`50`		`-}`
`51`		`-}`
`52`		`-}`
	`37`	`+[ProtoMember(9)]`
	`38`	`+publicstringPushLocation{get;set;}`
`53`	`39`
`54`	`40`	`[ProtoMember(5)]`
`55`	`41`	`publicint?UnitId{get;set;}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public PushService(IPushLogsService pushLogsService, INotificationProvider notif`
`35`	`35`
`36`	`36`	`publicasyncTask<bool>Register(PushUripushUri)`
`37`	`37`	`{`
`38`		`-if(pushUri==null\|\|String.IsNullOrWhiteSpace(pushUri.DeviceId))`
	`38`	`+if(pushUri==null\|\|String.IsNullOrWhiteSpace(pushUri.DeviceId)\|\|string.IsNullOrWhiteSpace(pushUri.PushLocation))`
`39`	`39`	`returnfalse;`
`40`	`40`
`41`	`41`	`varcode=pushUri.PushLocation;`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -154,8 +154,13 @@ public async Task<ActionResult<PushRegistrationResult>> RegisterDevice([FromBody`
`154`	`154`	`push.UserId=UserId;`
`155`	`155`	`push.PlatformType=registrationInput.Platform;`
`156`	`156`
`157`		`-vardepartment=await_departmentsService.GetDepartmentByIdAsync(DepartmentId,false);`
`158`		`-push.PushLocation=department.Code;`
	`157`	`+if(!string.IsNullOrWhiteSpace(registrationInput.Prefix))`
	`158`	`+push.PushLocation=registrationInput.Prefix;`
	`159`	`+else`
	`160`	`+{`
	`161`	`+vardepartment=await_departmentsService.GetDepartmentByIdAsync(DepartmentId,false);`
	`162`	`+push.PushLocation=department.Code;`
	`163`	`+}`
`159`	`164`
`160`	`165`	`push.DeviceId=registrationInput.Token;`
`161`	`166`	`push.Uuid=registrationInput.DeviceUuid;`

Comments

(0)