Index: trunk/eCard/eCardMVC/Platnosci.Core/Interface/IDataContext.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Core/Interface/IDataContext.cs (revision 872) +++ trunk/eCard/eCardMVC/Platnosci.Core/Interface/IDataContext.cs (revision 877) @@ -16,4 +16,5 @@ IQueryable FindInvoiceById(int id); List FindItemsByIdFaktury(int idFaktury); + IQueryable FindPaymentByOrdernumber(int ordernumber); } } Index: trunk/eCard/eCardMVC/Platnosci.Core/Interface/IRepository.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Core/Interface/IRepository.cs (revision 870) +++ trunk/eCard/eCardMVC/Platnosci.Core/Interface/IRepository.cs (revision 877) @@ -43,4 +43,6 @@ List FindItemsByIdFaktury(int idFaktury); + + IQueryable FindPaymentByOrdernumber(int ordernumber); } } Index: trunk/eCard/eCardMVC/Platnosci.Core/Linq/DataContext1.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Core/Linq/DataContext1.cs (revision 872) +++ trunk/eCard/eCardMVC/Platnosci.Core/Linq/DataContext1.cs (revision 877) @@ -78,5 +78,13 @@ { return listaPlatnosci; - } + } + public IQueryable FindPaymentByOrdernumber(int ordernumber) + { + var query = from l in _dataContext.PlatnosciEcards + where l.ORDERNUMBER == ordernumber + select l; + + return query; + } } Index: trunk/eCard/eCardMVC/Platnosci.Core/Linq/Repository.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Core/Linq/Repository.cs (revision 872) +++ trunk/eCard/eCardMVC/Platnosci.Core/Linq/Repository.cs (revision 877) @@ -96,4 +96,8 @@ return _dataContext.FindItemsByIdFaktury(idFaktury); } + public IQueryable FindPaymentByOrdernumber(int ordernumber) + { + return _dataContext.FindPaymentByOrdernumber(ordernumber); + } } } Index: trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 870) +++ trunk/eCard/eCardMVC/Platnosci/Controllers/MerchantController.cs (revision 877) @@ -29,4 +29,5 @@ public const string KOD_POLSKA = "616"; //kod kraju Akceptanta - Polska public const string KODOWANIE = "ISO-8859-2"; + private int ORDERNUMBER = 122; private string merchantId; @@ -43,4 +44,5 @@ public ActionResult Merchant(Payer payer, string language) { + System.Diagnostics.Debug.WriteLine("MerchantController:Merchant:" + language); language = _func.setLanguage(language); @@ -71,8 +73,9 @@ string link = ConfigurationManager.AppSettings["StatusLink"]; - string LinkFail = link + "?status=fail"; - string LinkOk = link + "?status=ok"; + string LinkFail = link + "?id=" + newPayment.IDFaktury + "&status=fail"; + string LinkOk = link + "?id=" + newPayment.IDFaktury + "&status=ok"; var merchantViewData = InitMerchantViewData(newPayment, hash, merchantId, LinkFail, LinkOk); + wyslij(merchantViewData, hash, merchantId); return View(merchantViewData); } @@ -90,5 +93,5 @@ newPayment.SURNAME = payer.LastName; newPayment.AUTODEPOSIT = true; - newPayment.LANGUAGE = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper(); //"PL"; + newPayment.LANGUAGE = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName.ToUpper(); newPayment.CHARSET = KODOWANIE; newPayment.COUNTRY = KOD_POLSKA; @@ -119,9 +122,9 @@ //wartosci testowe - merchantViewData.nowaPlatnosc.ORDERNUMBER = 4; - merchantViewData.nowaPlatnosc.ORDERDESCRIPTION = "22"; + merchantViewData.nowaPlatnosc.ORDERNUMBER = ORDERNUMBER; + merchantViewData.nowaPlatnosc.ORDERDESCRIPTION = "222"; merchantViewData.nowaPlatnosc.AMOUNT = 300; merchantViewData.nowaPlatnosc.CURRENCY = "985"; - merchantViewData.nowaPlatnosc.SESSIONID = ""; + merchantViewData.nowaPlatnosc.SESSIONID = "ff"; merchantViewData.merchantId = "171485000"; merchantViewData.LinkFail = ""; @@ -141,5 +144,5 @@ //dane testowe - string adres = "https://pay.ecard.pl/servlet/HS?orderNumber=4"; + string adres = "https://pay.ecard.pl/servlet/HS?orderNumber="+ORDERNUMBER; HttpWebRequest req = (HttpWebRequest)WebRequest.Create(adres); string dane = "&orderDescription=&amount=300¤cy=985&merchantId=171485000&password=ashSeth2"; @@ -159,5 +162,14 @@ return strResponse; - } + } + private void wyslij(MerchantViewData m, string hash, string id) + { + string adres = "https://pay.ecard.pl/servlet/PSTEST?ORDERDESCRIPTION="+m.nowaPlatnosc.ORDERDESCRIPTION; + HttpWebRequest req = (HttpWebRequest)WebRequest.Create(adres); + string dane = "&AMOUNT=300&CURRENCY=985&ORDERNUMBER="+ORDERNUMBER+"&NAME="+m.nowaPlatnosc.NAME+"&SURNAME="+m.nowaPlatnosc.SURNAME+"&LANGUAGE=PL&CHARSET=ISO-8859-2"; + dane += "&COUNTRY=616&PAYMENTTYPE=CARDS&JS=1&HASH=" + hash + "&MERCHANTID=171485000&AUTODEPOSIT=" + m.nowaPlatnosc.AUTODEPOSIT + "&LINKFAIL="; + dane += "&LINKOK=&SESSIONID="; + Response.Redirect(adres + dane); + } } } Index: trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 873) +++ trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 877) @@ -106,8 +106,7 @@ if (payer != null) { - System.Diagnostics.Debug.WriteLine("P;atnosciController:Show"); + System.Diagnostics.Debug.WriteLine("PlatnosciController:Show"); return RedirectToAction("Merchant", "Merchant", payer); - } - + } else return View("Error"); } @@ -235,5 +234,6 @@ public void UpdateStatus(int ordernumber, string validationcode) { - var platnosc = _repPl.FindOne(i => i.ORDERNUMBER == ordernumber); + var platnosc = _rep.FindPaymentByOrdernumber(ordernumber).SingleOrDefault(); + //Pl.FindOne(i => i.ORDERNUMBER == ordernumber); if (platnosc != null && platnosc.Status == true && validationcode == "000") { Index: trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 872) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 877) @@ -80,5 +80,8 @@ + + + Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 872) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 877) @@ -23,65 +23,23 @@ { private string merchantNumber = "123"; + private int orderNumber = 9999; + private string code_Ok = "000"; //poprawna transakcja + private string code_Bad = "111"; //transakcja nieudana - zły numer karty + private DateTime data = DateTime.Now; + private string testNip1 = "12345"; + private string testNip2 = "01234"; + private int testIdFaktury = 1000; + private string testNumerFaktury = "abcd"; + private decimal testBrutto = 200; + + private Function _f = new Function(); private FunkcjePlatnosci _func = new FunkcjePlatnosci(); - - /*[TearDown] - public void TearDown() - { - IRepository _rep = new Repository(); - var potwierdzeniaEcard = _rep.Find(p => p.MERCHANTNUMBER == merchantNumber); - - foreach (var pe in potwierdzeniaEcard) - { - _rep.Delete(pe); - } - } - */ - - public vPlatnosciEcard createPayment(int id, string nip, string fak_numer, decimal brutto, byte SystemKsiegowy) - { - - vPlatnosciEcard platnosc = new vPlatnosciEcard(); - platnosc.ID_faktury = id; - platnosc.nip = nip; - platnosc.Faktura_Numer = fak_numer; - platnosc.Brutto = brutto; - platnosc.SystemKsiegowyId = SystemKsiegowy; - - return platnosc; - } - public PlatnosciEcard createNewPayment(int ordernumber, bool status, DateTime data, int id_faktury) - { - PlatnosciEcard platnosc = new PlatnosciEcard(); - platnosc.ORDERNUMBER = ordernumber; - platnosc.Status = status; - platnosc.Status_data = data; - platnosc.IDFaktury = id_faktury; - - return platnosc; - } - public Payer createPayer(int id, string name, string surname) - { - Payer payer = new Payer(); - payer.Id_faktury = id; - payer.FirstName = name; - payer.LastName = surname; - - return payer; - } - public ControllerContext createControllerContext(string UserIdentity) - { - - var mock = new Mock(); - mock.SetupGet(m => m.HttpContext.User.Identity.Name).Returns(UserIdentity); - mock.SetupGet(m => m.HttpContext.Request.IsAuthenticated).Returns(true); - - return mock.Object; - } + [Test] [Category("Unit")] public void Status_Saves_Correct_Transaction() { - var orderNumber = 9999; - FakeDataContext fake = new FakeDataContext(); + FakeDataContext fake = new FakeDataContext(2); + DateTime datka = DateTime.Now; var builder = new TestControllerBuilder(); var controller = new PlatnoscController(fake); @@ -91,10 +49,40 @@ builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString()); builder.Form.Add("ORDERNUMBER", orderNumber.ToString()); - + builder.Form.Add("VALIDATIONCODE", code_Ok); + var result = controller.Status(); IRepository _rep = new Repository(fake); var potwierdzeniaEcard = _rep.Find(p => p.ORDERNUMBER == orderNumber).First(); - Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber)); + Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber)); + PlatnosciEcard payment_after_update = _rep.FindPaymentByOrdernumber(orderNumber).SingleOrDefault(); + + Assert.That(payment_after_update.Status_data, Is.GreaterThan(datka)); + + } + [Test] + [Category("Unit")] + public void Status_Saves_Correct_Transaction_InCorrectUpdate() + { + FakeDataContext fake = new FakeDataContext(2); + DateTime datka = DateTime.Now; + var builder = new TestControllerBuilder(); + var controller = new PlatnoscController(fake); + builder.InitializeController(controller); + builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString()); + builder.Form.Add("AUTHTIME", DateTime.Now.ToString()); + builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString()); + builder.Form.Add("ORDERNUMBER", orderNumber.ToString()); + builder.Form.Add("VALIDATIONCODE", code_Bad); + + var result = controller.Status(); + + IRepository _rep = new Repository(fake); + var potwierdzeniaEcard = _rep.Find(p => p.ORDERNUMBER == orderNumber).First(); + Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber)); + + PlatnosciEcard payment_after_update = _rep.FindPaymentByOrdernumber(orderNumber).SingleOrDefault(); + System.Diagnostics.Debug.WriteLine(datka + " **** " + payment_after_update.Status_data); + Assert.That(payment_after_update.Status_data, Is.LessThanOrEqualTo(datka)); } [Test] @@ -105,13 +93,12 @@ IRepository _rep = new Repository(fake); - DateTime data = DateTime.Now; - PlatnosciEcard platnosc = createNewPayment(1, true, data, 1); + PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, true, data, 1); _rep.Insert(platnosc); var controller = new PlatnoscController(fake); - controller.UpdateStatus(1, "000"); //000 - płatność poprawna - + controller.UpdateStatus(orderNumber, code_Ok); + PlatnosciEcard payment_after_update = new PlatnosciEcard(); - payment_after_update = _rep.FindOne(i => i.ORDERNUMBER == 1); + payment_after_update = _rep.FindOne(i => i.ORDERNUMBER == orderNumber); Assert.That(payment_after_update.Status_data, Is.GreaterThan(data)); } @@ -123,45 +110,16 @@ IRepository _rep = new Repository(fake); - DateTime data = DateTime.Now; - - PlatnosciEcard platnosc = createNewPayment(1, true, data, 1); - _rep.Insert(platnosc); - - var controller = new PlatnoscController(fake); - controller.UpdateStatus(1, "111"); //111 - płatność niepoprawna, ze wzgledu na zly numer karty + PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, true, data, 1); + _rep.Insert(platnosc); + + var controller = new PlatnoscController(fake); + controller.UpdateStatus(orderNumber, code_Bad); PlatnosciEcard payment_after_update = new PlatnosciEcard(); - payment_after_update = _rep.FindOne(i => i.ORDERNUMBER == 1); + payment_after_update = _rep.FindOne(i => i.ORDERNUMBER == orderNumber); Assert.That(payment_after_update.Status_data, Is.EqualTo(data)); } [Test] [Category("Unit")] - public void TestFindInvoiceByNumber() - { - FakeDataContext fake = new FakeDataContext(); - IRepository _rep = new Repository(fake); - - vPlatnosciEcard platnosc = new vPlatnosciEcard(); - platnosc = _rep.FindInvoiceById(1).SingleOrDefault(); - Assert.That(platnosc.Faktura_Numer, Is.EqualTo("1")); - } - [Test] - [Category("Unit")] - public void TestInsertMethodForPayment() - { - FakeDataContext fake = new FakeDataContext(); - IRepository _rep = new Repository(fake); - - vPlatnosciEcard platnosc = createPayment(13, "nipek", "", 0, 0); - _rep.Insert(platnosc); - - vPlatnosciEcard pl1 = createPayment(14, "vv", "", 0, 0); - _rep.Insert(pl1); - - vPlatnosciEcard pl = _rep.FindInvoiceById(13).SingleOrDefault(); - Assert.That(pl.nip, Is.EqualTo("nipek")); - } - [Test] - [Category("Unit")] public void ActionShowPayment_IncorrectUserIdentity_ReturnErrorView() { @@ -169,13 +127,12 @@ IRepository _rep = new Repository(fake); - vPlatnosciEcard platnosc = createPayment(74828, "854956281", "27/ASZ/2009", 0, 0); - _rep.Insert(platnosc); - - var controller = new PlatnoscController(fake); - controller.ControllerContext = createControllerContext("1"); - controller.setWeryfikacja("Niepoprawny nip"); - + vPlatnosciEcard platnosc = _f.createPayment(testIdFaktury, testNip1, testNumerFaktury, 0, 0); + _rep.Insert(platnosc); + + var controller = new PlatnoscController(fake); + controller.ControllerContext = _f.createControllerContext(testNip2); + controller.setWeryfikacja("Niepoprawny nip"); - var result = controller.Show("74828","pl") as ViewResult; + var result = controller.Show(testIdFaktury.ToString(),"pl") as ViewResult; var error = (ErrorViewData)result.ViewData.Model; @@ -190,13 +147,10 @@ IRepository _rep = new Repository(fake); - vPlatnosciEcard platnosc = createPayment(74828, "854956281", "27/ASZ/2009", 0,0); - _rep.Insert(platnosc); - - var controller = new PlatnoscController(fake); - - controller.ControllerContext = createControllerContext("854956281"); + var controller = new PlatnoscController(fake); + + controller.ControllerContext = _f.createControllerContext(testNip1); controller.setBrakDanych("Platnosc o takim id nie istnieje"); - var result = controller.Show("123", "pl") as ViewResult; + var result = controller.Show(testIdFaktury.ToString(), "pl") as ViewResult; var error = (ErrorViewData)result.ViewData.Model; @@ -211,8 +165,8 @@ var controller = new PlatnoscController(fake); - controller.ControllerContext = createControllerContext("nip"); + controller.ControllerContext = _f.createControllerContext(testNip1); controller.setZaplacono("Platnosc zostala uregulowana"); - var result = controller.Show("128", "pl") as ViewResult; + var result = controller.Show(testIdFaktury.ToString(), "pl") as ViewResult; var error = (ErrorViewData)result.ViewData.Model; @@ -227,16 +181,16 @@ IRepository _rep = new Repository(fake); - vPlatnosciEcard platnosc = createPayment(74828,"854956281","27/ASZ/2009",200,0); - _rep.Insert(platnosc); - - var controller = new PlatnoscController(fake); - controller.ControllerContext = createControllerContext("854956281"); - - var result = controller.Show("74828", "pl") as ViewResult; + vPlatnosciEcard platnosc = _f.createPayment(testIdFaktury, testNip1, testNumerFaktury, testBrutto, 0); + _rep.Insert(platnosc); + + var controller = new PlatnoscController(fake); + controller.ControllerContext = _f.createControllerContext(testNip1); + + var result = controller.Show(testIdFaktury.ToString(), "pl") as ViewResult; Assert.IsInstanceOfType(typeof(InvoiceDetailsViewData), result.ViewData.Model); var view = (InvoiceDetailsViewData)result.ViewData.Model; - Assert.That(view.vPlatnosciEcard.Brutto, Is.EqualTo(200)); - Assert.That(view.vPlatnosciEcard.Faktura_Numer, Is.EqualTo("27/ASZ/2009")); + Assert.That(view.vPlatnosciEcard.Brutto, Is.EqualTo(testBrutto)); + Assert.That(view.vPlatnosciEcard.Faktura_Numer, Is.EqualTo(testNumerFaktury)); } [Test] @@ -247,11 +201,11 @@ IRepository _rep = new Repository(fake); - vPlatnosciEcard platnosc = createPayment(74828, "854956281", "27/ASZ/2009", 200, 2); - _rep.Insert(platnosc); - - var controller = new PlatnoscController(fake); - controller.ControllerContext = createControllerContext("854956281"); - - Payer payer = createPayer(74828, "", "test"); //Brak imienia + vPlatnosciEcard platnosc = _f.createPayment(testIdFaktury, testNip1, testNumerFaktury, testBrutto, 2); + _rep.Insert(platnosc); + + var controller = new PlatnoscController(fake); + controller.ControllerContext = _f.createControllerContext(testNip1); + + Payer payer = _f.createPayer(testIdFaktury, "", "test"); //Brak imienia controller.Show(payer, "pl"); @@ -265,36 +219,16 @@ IRepository _rep = new Repository(fake); - vPlatnosciEcard platnosc = createPayment(74828, "854956281", "27/ASZ/2009", 200, 2); - _rep.Insert(platnosc); - - var controller = new PlatnoscController(fake); - controller.ControllerContext = createControllerContext("854956281"); - - Payer payer = createPayer(74828, "test", "test"); - controller.Show(payer, "pl"); - - Assert.That(controller.ModelState.IsValid, Is.True); - } - [Test] - [Category("UI")] - public void checkLoginCorrect() - { - IE ie = new IE("http://localhost:3646/pl/Account/LogOn"); - ie.TextField(Find.ByName("numer_faktury")).TypeText("24/HOL/2009"); - ie.TextField(Find.ByName("nip")).TypeText("501379568"); - ie.Button(Find.ById("but")).Click(); - Assert.IsTrue(ie.ContainsText("została uregulowana")); - } - [Test] - [Category("UI")] - public void checkErrorLogin() - { - IE ie = new IE("http://localhost:3646/pl/Account/LogOn"); - ie.TextField(Find.ByName("numer_faktury")).TypeText(""); - ie.TextField(Find.ByName("nip")).TypeText(""); - ie.Button(Find.ById("but")).Click(); - Assert.IsTrue(ie.ContainsText("Logowanie nie powiodło się")); - } - + vPlatnosciEcard platnosc = _f.createPayment(testIdFaktury, testNip1, testNumerFaktury, testBrutto, 2); + _rep.Insert(platnosc); + + var controller = new PlatnoscController(fake); + controller.ControllerContext = _f.createControllerContext(testNip1); + + Payer payer = _f.createPayer(testIdFaktury, "test", "test"); + var result = controller.Show(payer, "pl") as ViewResult; + + System.Diagnostics.Debug.WriteLine("AfterPay_PaymentIsValid_Test"); + Assert.That(controller.ModelState.IsValid, Is.True, "Model powinien byc true"); + } } } Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs =================================================================== --- trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs (revision 872) +++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs (revision 877) @@ -48,7 +48,14 @@ public FakeDataContext(int i) { - listaPlatnosci.Add(DodajPlatnosc(128, "numerfaktury", "nip")); - listaPl.Add(createNewPayment(158, true, DateTime.Now, 128)); - listaPotwierdzenia.Add(DodajPotwierdzenie("000", 158)); + if (i == 1) + { + listaPlatnosci.Add(DodajPlatnosc(1000, "abcd", "12345")); + listaPl.Add(createNewPayment(9999, true, DateTime.Now, 1000)); + listaPotwierdzenia.Add(DodajPotwierdzenie("000", 9999)); + } + else if (i == 2) + { + listaPl.Add(createNewPayment(9999, true, DateTime.Now, 1000)); + } } public IQueryable GetTable() where T : class @@ -87,4 +94,14 @@ public IQueryable FindInvoiceByNipNumber(string nip, string numer) { + List lp = lista; + for (int i = 0; i < lp.Count(); i++) + { + if (lp[i].GetType() == typeof(vPlatnosciEcard)) + { + listaPlatnosci.Add((vPlatnosciEcard)lp[i]); + } + } + lista.Clear(); + var query = from l in listaPlatnosci where l.nip == nip && l.Faktura_Numer == numer @@ -105,4 +122,12 @@ return listazaplaconych; } + public IQueryable FindPaymentByOrdernumber(int ordernumber) + { + var query = from l in listaPl + where l.ORDERNUMBER == ordernumber + select l; + + return query.AsQueryable(); + } public void SubmitChanges() {