Projects >> platform >>550bd64a7397f1bd4bdb4715f2070fc556a6f719

Chunk
Conflicting content 
import com.fb.platform.promotion.exception.InvalidCouponTypeException;
import com.fb.platform.promotion.exception.PromotionNotFoundException;
import com.fb.platform.promotion.model.coupon.CouponLimitsConfig;
<<<<<<< HEAD
import com.fb.platform.promotion.model.scratchCard.ScratchCard;
import com.fb.platform.promotion.rule.RuleConfigDescriptor;
import com.fb.platform.promotion.rule.RuleConfigDescriptorItem;
import com.fb.platform.promotion.rule.RulesEnum;
import com.fb.platform.promotion.service.CouponAlreadyAssignedToUserException;
import com.fb.platform.promotion.service.CouponCodeGenerationException;
import com.fb.platform.promotion.service.CouponNotFoundException;
import com.fb.platform.promotion.service.InvalidAlphaNumericTypeException;
import com.fb.platform.promotion.service.InvalidCouponTypeException;
import com.fb.platform.promotion.service.PromotionNotFoundException;
import com.fb.platform.promotion.service.ScratchCardNotFoundException;
=======
import com.fb.platform.promotion.rule.RulesEnum;
import com.fb.platform.promotion.rule.config.RuleConfigDescriptor;
import com.fb.platform.promotion.rule.config.RuleConfigItemDescriptor;
>>>>>>> 52f5470887183a06291951655b8608437cb125a6
import com.fb.platform.promotion.util.MessageTranslatorUtility;
import com.fb.platform.promotion.util.PromotionRuleFactory;
import com.fb.platform.user.manager.exception.InvalidUserNameException;
Solution content 
import com.fb.platform.promotion.exception.InvalidCouponTypeException;
import com.fb.platform.promotion.exception.PromotionNotFoundException;
import com.fb.platform.promotion.exception.ScratchCardNotFoundException;
import com.fb.platform.promotion.model.coupon.CouponLimitsConfig;
import com.fb.platform.promotion.model.scratchCard.ScratchCard;
import com.fb.platform.promotion.rule.RulesEnum;
import com.fb.platform.promotion.rule.config.RuleConfigDescriptor;
import com.fb.platform.promotion.rule.config.RuleConfigItemDescriptor;
import com.fb.platform.promotion.util.MessageTranslatorUtility;
import com.fb.platform.promotion.util.PromotionRuleFactory;
import com.fb.platform.user.manager.exception.InvalidUserNameException;
File
PromotionAdminManagerImpl.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import com.fb.platform.promotion.admin.to.SearchPromotionOrderBy;
import com.fb.platform.promotion.admin.to.SortOrder;
import com.fb.platform.promotion.dao.RuleDao;
<<<<<<< HEAD
import com.fb.platform.promotion.dao.ScratchCardDao;
=======
import com.fb.platform.promotion.exception.CouponAlreadyAssignedToUserException;
import com.fb.platform.promotion.exception.CouponNotFoundException;
import com.fb.platform.promotion.exception.InvalidCouponTypeException;
import com.fb.platform.promotion.exception.PromotionNotFoundException;
>>>>>>> 52f5470887183a06291951655b8608437cb125a6
import com.fb.platform.promotion.model.coupon.Coupon;
import com.fb.platform.promotion.model.coupon.CouponLimitsConfig;
import com.fb.platform.promotion.model.coupon.CouponType;
Solution content 
import com.fb.platform.promotion.admin.to.SearchPromotionOrderBy;
import com.fb.platform.promotion.admin.to.SortOrder;
import com.fb.platform.promotion.dao.RuleDao;
import com.fb.platform.promotion.dao.ScratchCardDao;
import com.fb.platform.promotion.exception.CouponAlreadyAssignedToUserException;
import com.fb.platform.promotion.exception.CouponNotFoundException;
import com.fb.platform.promotion.exception.InvalidCouponTypeException;
import com.fb.platform.promotion.exception.PromotionNotFoundException;
import com.fb.platform.promotion.exception.ScratchCardNotFoundException;
import com.fb.platform.promotion.model.coupon.Coupon;
import com.fb.platform.promotion.model.coupon.CouponLimitsConfig;
import com.fb.platform.promotion.model.coupon.CouponType;
File
PromotionAdminServiceImpl.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
	LoginResponse responseUser = null;

	private static int promotionId = -4100;
<<<<<<< HEAD

	private static int[] validFromSort = new int[] { -3001, -3002, -3003 };

	private static int[] validTillSort = new int[] { -3003, -3002, -3001 };

	private static int[] nameSort = new int[] { -3001, -3002, -3003 };

	private static int[] nameSearch = new int[] { -3001, -3002 };

	private static int[] validFromSearch = new int[] { -3001, -3002 };

	private static int[] validTillSearch = new int[] { -3 };

	private static int[] nameValidTillSearch = new int[] { -3002, -3003 };

	private static int[] validFromValidTillSearch = new int[] { -4000, -4100 };

	private static int[] nameValidFromSearch = new int[] { -3001, -3002 };

	private static int[] filterSearch = new int[] { -3001, -3002 };

	private static List ruleList = new ArrayList() {
		{
			add(RulesEnum.BUY_WORTH_X_GET_Y_RS_OFF_ON_Z_CATEGORY);
			add(RulesEnum.BUY_WORTH_X_GET_Y_RS_OFF);
			add(RulesEnum.BUY_WORTH_X_GET_Y_PERCENT_OFF);
			add(RulesEnum.BUY_X_BRAND_GET_Y_RS_OFF_ON_Z_PRODUCT);
			add(RulesEnum.BUY_WORTH_X_GET_Y_PERCENT_OFF_ON_Z_CATEGORY);
			add(RulesEnum.FIRST_PURCHASE_BUY_WORTH_X_GET_Y_RS_OFF);
			add(RulesEnum.BUY_X_GET_Y_FREE);
			add(RulesEnum.BUY_X_QUANTITY_GET_VARIABLE_PERCENT_OFF);
		}
	};

=======
	
	private static int[] validFromSort = new int[] {-3001, -3002, -3003};
	
	private static int[] validTillSort = new int[] {-3003, -3002, -3001};
	
	private static int[] nameSort = new int[] {-3001, -3002, -3003};
	
	private static int[] nameSearch = new int[] {-3001, -3002};
	
	private static int[] validFromSearch = new int[] {-3001, -3002};
	
	private static int[] validTillSearch = new int[] {-3};
	
	private static int[] nameValidTillSearch = new int[] {-3002, -3003};
	
	private static int[] validFromValidTillSearch = new int[] {-4000, -4100};
	
	private static int[] nameValidFromSearch = new int[] {-3001, -3002};
	
	private static int[] filterSearch = new int[] {-3001, -3002};
	
	private static List ruleList = new ArrayList() {{
		add(RulesEnum.BUY_WORTH_X_GET_Y_RS_OFF);
		add(RulesEnum.BUY_WORTH_X_GET_Y_PERCENT_OFF);
		add(RulesEnum.BUY_X_BRAND_GET_Y_RS_OFF_ON_Z_PRODUCT);
		add(RulesEnum.FIRST_PURCHASE_BUY_WORTH_X_GET_Y_RS_OFF);
		add(RulesEnum.BUY_X_GET_Y_FREE);
		add(RulesEnum.BUY_X_QUANTITY_GET_VARIABLE_PERCENT_OFF);
		add(RulesEnum.CATEGORY_BASED_VARIABLE_PERCENT_OFF);
	}};
	
>>>>>>> 52f5470887183a06291951655b8608437cb125a6
	@Before
	public void loginUser() {
Solution content 
	LoginResponse responseUser = null;

	private static int promotionId = -4100;
	
	private static int[] validFromSort = new int[] {-3001, -3002, -3003};
	
	private static int[] validTillSort = new int[] {-3003, -3002, -3001};
	
	private static int[] nameSort = new int[] {-3001, -3002, -3003};
	
	private static int[] nameSearch = new int[] {-3001, -3002};
	
	private static int[] validFromSearch = new int[] {-3001, -3002};
	
	private static int[] validTillSearch = new int[] {-3};
	
	private static int[] nameValidTillSearch = new int[] {-3002, -3003};
	
	private static int[] validFromValidTillSearch = new int[] {-4000, -4100};
	
	private static int[] nameValidFromSearch = new int[] {-3001, -3002};
	
	private static int[] filterSearch = new int[] {-3001, -3002};
	
	private static List ruleList = new ArrayList() {{
		add(RulesEnum.BUY_WORTH_X_GET_Y_RS_OFF);
		add(RulesEnum.BUY_WORTH_X_GET_Y_PERCENT_OFF);
		add(RulesEnum.BUY_X_BRAND_GET_Y_RS_OFF_ON_Z_PRODUCT);
		add(RulesEnum.FIRST_PURCHASE_BUY_WORTH_X_GET_Y_RS_OFF);
		add(RulesEnum.BUY_X_GET_Y_FREE);
		add(RulesEnum.BUY_X_QUANTITY_GET_VARIABLE_PERCENT_OFF);
		add(RulesEnum.CATEGORY_BASED_VARIABLE_PERCENT_OFF);
	}};
	
	@Before
	public void loginUser() {
File
PromotionAdminManagerImplTest.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
		searchPromotionRequest.setStartRecord(0);
		searchPromotionRequest.setSessionToken(responseUser.getSessionToken());
		searchPromotionRequest.setValidFrom(new DateTime(2012, 1, 2, 0, 0));
<<<<<<< HEAD

		SearchPromotionResponse searchPromotionResponse = promotionAdminManager
				.searchPromotion(searchPromotionRequest);

		searchPromotionResponse = promotionAdminManager
				.searchPromotion(searchPromotionRequest);
		assertEquals(SearchPromotionEnum.SUCCESS,
				searchPromotionResponse.getSearchPromotionEnum());
		assertEquals(13, searchPromotionResponse.getTotalCount());
=======
		
		SearchPromotionResponse searchPromotionResponse = promotionAdminManager.searchPromotion(searchPromotionRequest);
		
		searchPromotionResponse = promotionAdminManager.searchPromotion(searchPromotionRequest);
		assertEquals(SearchPromotionEnum.SUCCESS, searchPromotionResponse.getSearchPromotionEnum());
		assertEquals(14, searchPromotionResponse.getTotalCount());
>>>>>>> 52f5470887183a06291951655b8608437cb125a6
		assertEquals(2, searchPromotionResponse.getPromotionsList().size());

		int count = 0;
Solution content 
		searchPromotionRequest.setStartRecord(0);
		searchPromotionRequest.setSessionToken(responseUser.getSessionToken());
		searchPromotionRequest.setValidFrom(new DateTime(2012, 1, 2, 0, 0));
		
		SearchPromotionResponse searchPromotionResponse = promotionAdminManager.searchPromotion(searchPromotionRequest);
		
		searchPromotionResponse = promotionAdminManager.searchPromotion(searchPromotionRequest);
		assertEquals(SearchPromotionEnum.SUCCESS, searchPromotionResponse.getSearchPromotionEnum());
		assertEquals(14, searchPromotionResponse.getTotalCount());

		assertEquals(2, searchPromotionResponse.getPromotionsList().size());

		int count = 0;
File
PromotionAdminManagerImplTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		searchPromotionRequest.setBatchSize(10);
		searchPromotionRequest.setStartRecord(0);
		searchPromotionRequest.setSessionToken(responseUser.getSessionToken());
<<<<<<< HEAD

		SearchPromotionResponse searchPromotionResponse = promotionAdminManager
				.searchPromotion(searchPromotionRequest);
		assertEquals(SearchPromotionEnum.SUCCESS,
				searchPromotionResponse.getSearchPromotionEnum());
		assertEquals(19, searchPromotionResponse.getTotalCount());
=======
		
		SearchPromotionResponse searchPromotionResponse = promotionAdminManager.searchPromotion(searchPromotionRequest);
		assertEquals(SearchPromotionEnum.SUCCESS, searchPromotionResponse.getSearchPromotionEnum());
		assertEquals(20, searchPromotionResponse.getTotalCount());
>>>>>>> 52f5470887183a06291951655b8608437cb125a6
		assertEquals(10, searchPromotionResponse.getPromotionsList().size());
	}
Solution content 
		searchPromotionRequest.setBatchSize(10);
		searchPromotionRequest.setStartRecord(0);
		searchPromotionRequest.setSessionToken(responseUser.getSessionToken());
		SearchPromotionResponse searchPromotionResponse = promotionAdminManager.searchPromotion(searchPromotionRequest);
		assertEquals(SearchPromotionEnum.SUCCESS, searchPromotionResponse.getSearchPromotionEnum());
		assertEquals(20, searchPromotionResponse.getTotalCount());
		assertEquals(10, searchPromotionResponse.getPromotionsList().size());
	}
File
PromotionAdminManagerImplTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable