Subversion Repositories SmartDukaan

Rev

Rev 35837 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 35837 Rev 35840
Line 65... Line 65...
65 
		return responseSender.ok(true);
 65 
		return responseSender.ok(true);
66 
	}
 66 
	}
67 
 
 67 
 
68 
	private Device deviceInfo(HttpServletRequest request, AddDevicesRequest addDevicesRequest) {
 68 
	private Device deviceInfo(HttpServletRequest request, AddDevicesRequest addDevicesRequest) {
69 
		Device device = deviceRepository.selectByImeiNumber(addDevicesRequest.getImeinumber());
 69 
		Device device = deviceRepository.selectByImeiNumber(addDevicesRequest.getImeinumber());
- 
 
 70 
		// Web sends null IMEI — fallback to FCM token lookup to avoid duplicate rows
- 
 
 71 
		if (device == null && addDevicesRequest.getImeinumber() == null && addDevicesRequest.getGcm_regid() != null) {
- 
 
 72 
			device = deviceRepository.selectByFcmId(addDevicesRequest.getGcm_regid());
- 
 
 73 
		}
70 
		LOGGER.info("devices" + device);
 74 
		LOGGER.info("devices" + device);
71 
		if (device == null) {
 75 
		if (device == null) {
72 
			device = new Device();
 76 
			device = new Device();
73 
			device.setImeiNumber(addDevicesRequest.getImeinumber());
 77 
			device.setImeiNumber(addDevicesRequest.getImeinumber());
74 
		}
 78 
		}