device_no

scripts/migrate_paid_users.go

@@ -276,13 +276,13 @@ func main() {
 			SELECT user_id AS uid FROM ` + "`order`" + ` WHERE status = ? AND user_id > 0
 			UNION
 			SELECT user_id AS uid FROM apple_iap_transactions WHERE user_id > 0
-			UNION
-			SELECT user_id AS uid FROM user_subscribe WHERE user_id > 0
 		) t
+		INNER JOIN user_subscribe s ON s.user_id = t.uid
 		INNER JOIN user u ON u.id = t.uid
-		WHERE u.id NOT IN (
+		WHERE (s.expire_time IS NULL OR s.expire_time > NOW())
+		  AND u.id NOT IN (
 			SELECT user_id FROM user_auth_methods WHERE auth_type = 'email' AND auth_identifier = 'devneeds52@gmail.com'
-		)
+		  )
 		ORDER BY t.uid
 	`, orderStatusCompleted).Scan(&paidIDs).Error
 	if err != nil {