From bbc40f15387903f60426537dde7f530a866584f8 Mon Sep 17 00:00:00 2001 From: Ayoub BENALI Date: Mon, 14 Jan 2013 13:05:55 +0100 Subject: [PATCH] updated the API from the webapp (server) --- MavLift/.gitignore | 2 +- MavLift/GNU_AFFERO_GPL_V3_19_Nov_1997.txt | 661 ++++++++++++++++++ ...idual_Contributor_Assignment_Agreement.txt | 128 ++++ MavLift/LICENSE | 202 ------ MavLift/LICENSE.txt | 201 ------ ...HEADER_to_be_included_at_top_of_every_file | 15 - MavLift/MavLift.iml | 39 -- MavLift/NOTICE | 35 +- MavLift/obp_api.iml | 82 --- MavLift/pom.xml | 94 +-- MavLift/src/main/resources/git.properties | 14 + .../main/scala/bootstrap/liftweb/Boot.scala | 123 ++-- .../scala/code/actors/EnvelopeInserter.scala | 45 +- MavLift/src/main/scala/code/comet/.keep | 0 MavLift/src/main/scala/code/model/OAuth.scala | 42 +- .../scala/code/model/dataAccess/Account.scala | 132 ++-- .../code/model/dataAccess/Connectors.scala | 84 ++- .../code/model/dataAccess/MongoConfig.scala | 43 +- .../model/dataAccess/OBPTransaction.scala | 379 +++------- .../scala/code/model/dataAccess/OBPUser.scala | 65 +- .../implementedTraits/AccountOwnerImpl.scala | 43 +- .../implementedTraits/BankAccountImpl.scala | 43 +- .../model/implementedTraits/BankImpl.scala | 43 +- .../implementedTraits/MetadataImpl.scala | 43 +- .../OtherBankAccountImpl.scala | 43 +- .../implementedTraits/TransactionImpl.scala | 43 +- .../model/implementedTraits/ViewsImpl.scala | 101 ++- .../code/model/traits/AccountOwner.scala | 32 + .../main/scala/code/model/traits/Bank.scala | 59 ++ .../scala/code/model/traits/BankAccount.scala | 55 ++ .../scala/code/model/traits/Comment.scala | 53 +- .../scala/code/model/traits/Metadata.scala | 32 + .../scala/code/model/traits/Moderated.scala | 96 ++- .../code/model/traits/OtherBankAccount.scala | 32 + .../scala/code/model/traits/Transaction.scala | 32 + .../main/scala/code/model/traits/User.scala | 42 +- .../main/scala/code/model/traits/View.scala | 86 ++- .../scala/code/snippet/CustomEditable.scala | 43 +- .../src/main/scala/code/snippet/Login.scala | 45 +- .../src/main/scala/code/snippet/OBPREST.scala | 265 ++++--- MavLift/src/main/scala/code/view/.keep | 0 MavLift/src/main/webapp/favicon.ico | Bin 0 -> 1786 bytes MavLift/src/main/webapp/index.html | 51 +- MavLift/src/main/webapp/media/css/website.css | 55 +- .../src/main/webapp/media/images/favicon.ico | Bin 0 -> 1786 bytes .../src/main/webapp/media/images/moreInfo.png | Bin 0 -> 925 bytes .../main/webapp/templates-hidden/_login.html | 30 + .../main/webapp/templates-hidden/default.html | 44 +- MavLift/src/test/scala/RunWebApp.scala | 40 +- MavLift/src/test/scala/code/AppTest.scala | 36 +- MongoRecordExamplesSpec.scala | 574 --------------- README | 71 +- scala_snippets.txt | 545 --------------- 53 files changed, 2368 insertions(+), 2695 deletions(-) create mode 100644 MavLift/GNU_AFFERO_GPL_V3_19_Nov_1997.txt create mode 100644 MavLift/Harmony_Individual_Contributor_Assignment_Agreement.txt delete mode 100644 MavLift/LICENSE delete mode 100644 MavLift/LICENSE.txt delete mode 100644 MavLift/LICENSE_HEADER_to_be_included_at_top_of_every_file delete mode 100644 MavLift/MavLift.iml delete mode 100644 MavLift/obp_api.iml create mode 100644 MavLift/src/main/resources/git.properties delete mode 100755 MavLift/src/main/scala/code/comet/.keep delete mode 100755 MavLift/src/main/scala/code/view/.keep create mode 100644 MavLift/src/main/webapp/favicon.ico create mode 100644 MavLift/src/main/webapp/media/images/favicon.ico create mode 100644 MavLift/src/main/webapp/media/images/moreInfo.png create mode 100644 MavLift/src/main/webapp/templates-hidden/_login.html delete mode 100644 MongoRecordExamplesSpec.scala delete mode 100644 scala_snippets.txt diff --git a/MavLift/.gitignore b/MavLift/.gitignore index e8a8d2dba..c191b586f 100644 --- a/MavLift/.gitignore +++ b/MavLift/.gitignore @@ -1,2 +1,2 @@ target -MavLift/src/main/resources/props +MavLift/src/main/resources \ No newline at end of file diff --git a/MavLift/GNU_AFFERO_GPL_V3_19_Nov_1997.txt b/MavLift/GNU_AFFERO_GPL_V3_19_Nov_1997.txt new file mode 100644 index 000000000..dba13ed2d --- /dev/null +++ b/MavLift/GNU_AFFERO_GPL_V3_19_Nov_1997.txt @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/MavLift/Harmony_Individual_Contributor_Assignment_Agreement.txt b/MavLift/Harmony_Individual_Contributor_Assignment_Agreement.txt new file mode 100644 index 000000000..26226395f --- /dev/null +++ b/MavLift/Harmony_Individual_Contributor_Assignment_Agreement.txt @@ -0,0 +1,128 @@ +Harmony Individual Contributor Assignment Agreement + +Thank you for your interest in contributing to Open Bank Project ("We" or "Us"). + +This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please sign it and send it to Us by mail, email, fax, or electronic submission, following the instructions at [SUBMISSION_INSTRUCTIONS below]. This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us. + +1. Definitions + + "You" means the individual who Submits a Contribution to Us. + + "Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in [NONOWNER_INSTRUCTIONS below]. + + "Copyright" means all rights protecting works of authorship owned or controlled by You, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. + + "Material" means the work of authorship which is made available by Us to third parties. When this Agreement covers more than one software project, the Material means the work of authorship to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material. + + "Submit" means any form of electronic, verbal, or written communication sent to Us or our representatives, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us for the purpose of discussing and improving the Material, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." + + "Submission Date" means the date on which You Submit a Contribution to Us. + + "Effective Date" means the date You execute this Agreement or the date You first Submit a Contribution to Us, whichever is earlier. + + "Media" means any portion of a Contribution which is not software. + +2. Grant of Rights + +2.1 Copyright Assignment + +(a) At the time the Contribution is Submitted, You assign to Us all right, title, and interest worldwide in all Copyright covering the Contribution; provided that this transfer is conditioned upon compliance with Section 2.3. + +(b) To the extent that any of the rights in Section 2.1(a) cannot be assigned by You to Us, You grant to Us a perpetual, worldwide, exclusive, royalty-free, transferable, irrevocable license under such non-assigned rights, with rights to sublicense through multiple tiers of sublicensees, to practice such non-assigned rights, including, but not limited to, the right to reproduce, modify, display, perform and distribute the Contribution; provided that this license is conditioned upon compliance with Section 2.3. + +(c) To the extent that any of the rights in Section 2.1(a) can neither be assigned nor licensed by You to Us, You irrevocably waive and agree never to assert such rights against Us, any of our successors in interest, or any of our licensees, either direct or indirect; provided that this agreement not to assert is conditioned upon compliance with Section 2.3. + +(d) Upon such transfer of rights to Us, to the maximum extent possible, We immediately grant to You a perpetual, worldwide, non-exclusive, royalty-free, transferable, irrevocable license under such rights covering the Contribution, with rights to sublicense through multiple tiers of sublicensees, to reproduce, modify, display, perform, and distribute the Contribution. The intention of the parties is that this license will be as broad as possible and to provide You with rights as similar as possible to the owner of the rights that You transferred. This license back is limited to the Contribution and does not provide any rights to the Material. + +2.2 Patent License + +For patent claims including, without limitation, method, process, and apparatus claims which You [or Your Affiliates] own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3. + +2.3 Outbound License + +Based on the grant of rights in Sections 2.1 and 2.2, if We include Your Contribution in a Material, We may license the Contribution under any license(s), including copyleft, permissive, commercial, or proprietary licenses and we agree to license the Contribution under an AGPL V3 or later compatible license. + +2.4 Moral Rights. If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect. + +2.5 Our Rights. You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate. + +2.6 Reservation of Rights. Any rights not expressly assigned or licensed under this section are expressly reserved by You. + +3. Agreement + +You confirm that: + +(a) You have the legal authority to enter into this Agreement. + +(b) You own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2. + +(c) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement. + +(d) You have followed the instructions in [NONOWNER_INSTRUCTIONS], if You do not own the Copyright in the entire work of authorship Submitted. + +4. Disclaimer + +EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US AND BY US TO YOU. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW. + +5. Consequential Damage Waiver + +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU OR US BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED. + +6. Miscellaneous + +6.1 This Agreement will be governed by and construed in accordance with the laws of Germany excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement. + +6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings. + +6.3 If You or We assign the rights or obligations received through this Agreement to a third party, as a condition of the assignment, that third party must agree in writing to abide by all the rights and obligations in the Agreement. + +6.4 The failure of either party to require performance by the other party of any provision of this Agreement in one situation shall not affect the right of a party to require such performance at any time in the future. A waiver of performance under a provision in one situation shall not be considered a waiver of the performance of the provision in the future or a waiver of the provision in its entirety. + +6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law. + + + +You +________________________ +Name: ________________________ +Address: ________________________ + ________________________ + +Us +________________________ +Name: Simon Redfern +Title: CEO TESOBE / Music Pictures Ltd +Address: Osloerstrasse 16/17 + Berlin 13359, German + + + + + + +[SUBMISSION_INSTRUCTIONS] – In person. + + +[NONOWNER_INSTRUCTIONS] – Please tell us in person and in writing. + + + + + + + + + + + + + + + + + + + + + +This work is licensed under a Creative Commons Attribution 3.0 Unported License. \ No newline at end of file diff --git a/MavLift/LICENSE b/MavLift/LICENSE deleted file mode 100644 index 89990abdb..000000000 --- a/MavLift/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2011,2012 Music Pictures Ltd / TESOBE - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/MavLift/LICENSE.txt b/MavLift/LICENSE.txt deleted file mode 100644 index cb241fc64..000000000 --- a/MavLift/LICENSE.txt +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2011,2012 Music Pictures Ltd / TESOBE - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/MavLift/LICENSE_HEADER_to_be_included_at_top_of_every_file b/MavLift/LICENSE_HEADER_to_be_included_at_top_of_every_file deleted file mode 100644 index dab2cd884..000000000 --- a/MavLift/LICENSE_HEADER_to_be_included_at_top_of_every_file +++ /dev/null @@ -1,15 +0,0 @@ -Open Bank Project - -Copyright 2011,2012 TESOBE / Music Pictures Ltd. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/MavLift/MavLift.iml b/MavLift/MavLift.iml deleted file mode 100644 index a7db76603..000000000 --- a/MavLift/MavLift.iml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MavLift/NOTICE b/MavLift/NOTICE index 117bffc85..d05773491 100644 --- a/MavLift/NOTICE +++ b/MavLift/NOTICE @@ -1,9 +1,28 @@ -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Stefan Bethge : stefan AT tesobe DOT com - Everett Sochowski : everett AT tesobe DOT com +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com diff --git a/MavLift/obp_api.iml b/MavLift/obp_api.iml deleted file mode 100644 index 1a77e8629..000000000 --- a/MavLift/obp_api.iml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/MavLift/pom.xml b/MavLift/pom.xml index 3414f25a9..a6622d682 100644 --- a/MavLift/pom.xml +++ b/MavLift/pom.xml @@ -6,10 +6,10 @@ 4.0.0 com.tesobe - OBP-API + opan_bank 1.0 war - OBP-API + Opan Bank 2011 2.9.1 @@ -28,8 +28,7 @@ Scala-Tools Dependencies Repository for Releases http://scala-tools.org/repo-releases - - + scala-tools.snapshots Scala-Tools Dependencies Repository for Snapshots http://scala-tools.org/repo-snapshots @@ -105,6 +104,11 @@ 6.1.25 test + + org.bouncycastle + bcpg-jdk16 + 1.46 + org.scala-lang @@ -112,55 +116,33 @@ ${scala.version} test - - - - - - - - - - net.liftweb - lift-mongodb_2.9.1 - 2.4 - - - - - net.liftweb - lift-mongodb-record_2.9.1 - 2.4 - - - -org.mongodb -casbah_${scala.version} -2.3.0 -compile -pom - - - - - - - src/main/scala + src/main src/test/scala org.scala-tools maven-scala-plugin - 2.14.3 + 2.9 ${project.build.sourceEncoding} @@ -177,6 +159,11 @@ + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + org.apache.maven.plugins maven-resources-plugin @@ -213,7 +200,6 @@ 5 - net.sf.alchim yuicompressor-maven-plugin @@ -255,6 +241,24 @@ + + pl.project13.maven + git-commit-id-plugin + 2.1.0 + + + + revision + + + + + ${project.basedir}/.git + true + src/main/resources/git.properties + false + + diff --git a/MavLift/src/main/resources/git.properties b/MavLift/src/main/resources/git.properties new file mode 100644 index 000000000..89b5f36ba --- /dev/null +++ b/MavLift/src/main/resources/git.properties @@ -0,0 +1,14 @@ +#Generated by Git-Commit-Id-Plugin +#Mon Jan 14 12:47:17 CET 2013 +git.commit.id.abbrev=e74127f +git.commit.user.email=ayoub@tesobe.com +git.commit.message.full=changed the API calls to use the new HostedAccount class\n +git.commit.id=e74127f64c98257ed37cfbeb24ba66e8df22869c +git.commit.message.short=changed the API calls to use the new HostedAccount class +git.commit.user.name=Ayoub BENALI +git.build.user.name=Ayoub BENALI +git.commit.id.describe=e74127f-dirty +git.build.user.email=ayoub@tesobe.com +git.branch=dev +git.commit.time=23.11.2012 @ 11\:50\:20 CET +git.build.time=14.01.2013 @ 12\:47\:17 CET diff --git a/MavLift/src/main/scala/bootstrap/liftweb/Boot.scala b/MavLift/src/main/scala/bootstrap/liftweb/Boot.scala index 03fd9db98..9dfa4226f 100755 --- a/MavLift/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/MavLift/src/main/scala/bootstrap/liftweb/Boot.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ package bootstrap.liftweb @@ -35,7 +38,7 @@ import http._ import sitemap._ import Loc._ import mapper._ -import code.model.dataAccess.{MongoConfig,OBPUser,Privilege,Account, HostedBank, MongoDBLocalStorage, HostedAccount} +import code.model.dataAccess.{MongoConfig,OBPUser,Privilege,Account, MongoDBLocalStorage, HostedAccount} import code.model.{Nonce, Consumer, Token} import code.model.traits.{Bank, View, ModeratedTransaction} import code.model.implementedTraits.{BankImpl, Anonymous, View} @@ -48,7 +51,8 @@ import net.liftweb.util.Schedule import net.liftweb.mongodb.BsonDSL._ import code.model.dataAccess.LocalStorage import code.model.traits.BankAccount - +import net.liftweb.http.js.jquery.JqJsCmds +import javax.mail.{ Authenticator, PasswordAuthentication } /** * A class that's instantiated early and run. It allows the application * to modify lift's environment @@ -72,6 +76,13 @@ class Boot extends Loggable{ DB.defineConnectionManager(DefaultConnectionIdentifier, vendor) } + Mailer.authenticator = for { + user <- Props.get("mail.username") + pass <- Props.get("mail.password") + } yield new Authenticator { + override def getPasswordAuthentication = + new PasswordAuthentication(user,pass) + } // Use Lift's Mapper ORM to populate the database // you don't need to use Mapper to use Lift... use @@ -95,8 +106,7 @@ class Boot extends Loggable{ Schemifier.schemify(true, Schemifier.infoF _, HostedAccount) //lunch the scheduler to clean the database from the expired tokens and nonces Schedule.schedule(()=> OAuthHandshake.dataBaseCleaner, 2 minutes) - - + def check(bool: Boolean) : Box[LiftResponse] = { if(bool){ Empty @@ -110,26 +120,36 @@ class Boot extends Loggable{ val bank = URLParameters(0) val account = URLParameters(1) val viewName = URLParameters(2) - val bankAccount = BankAccount(bank, account) - val view = View.fromUrl(viewName) - for { - b <- bankAccount - v <- view + val transactionsAndView : Box[(List[ModeratedTransaction], View)] = for { + b <- BankAccount(bank, account) ?~ {"account " + account + " not found for bank " + bank} + v <- View.fromUrl(viewName) ?~ {"view " + viewName + " not found for account " + account + " and bank " + bank} if(b.authorisedAccess(v, OBPUser.currentUser)) } yield (b.getModeratedTransactions(v.moderate), v) + + transactionsAndView match { + case Failure(msg, _, _) => logger.info("Could not get transactions and view: " + msg) + case _ => //don't log anything + } + transactionsAndView } def getAccount(URLParameters : List[String]) = { val bankUrl = URLParameters(0) val accountUrl = URLParameters(1) - for { - account <- LocalStorage.getAccount(bankUrl,accountUrl) - user <- OBPUser.currentUser - bankAccount <- BankAccount(bankUrl, accountUrl) + val account = for { + account <- LocalStorage.getAccount(bankUrl,accountUrl) ?~ {"account " + accountUrl + " not found for bank " + bankUrl} + user <- OBPUser.currentUser ?~ {"user not found when attempting to access account " + account + " of bank " + bankUrl} + bankAccount <- BankAccount(bankUrl, accountUrl) ?~ {"account " + account + " not found for bank " + bankUrl} if(user.hasMangementAccess(bankAccount)) } yield account + + account match { + case Failure(msg, _, _) => logger.info("Could not get account: " + msg) + case _ => //don't log anything + } + account } def getTransaction(URLParameters : List[String]) = { @@ -139,12 +159,18 @@ class Boot extends Loggable{ val account = URLParameters(1) val transactionID = URLParameters(2) val viewName = URLParameters(3) - for{ - bankAccount <- BankAccount(bank, account) - transaction <- bankAccount.transaction(transactionID) - view <- View.fromUrl(viewName) + val transaction = for{ + bankAccount <- BankAccount(bank, account) ?~ {"account " + account + " not found for bank " + bank} + transaction <- bankAccount.transaction(transactionID) ?~ {"transaction " + transactionID + " not found in account " + account + " for bank " + bank} + view <- View.fromUrl(viewName) ?~ {"view " + viewName + " not found"} if(bankAccount.authorisedAccess(view, OBPUser.currentUser)) } yield (view.moderate(transaction),view) + + transaction match { + case Failure(msg, _, _) => logger.info("Could not get transaction: " + msg) + case _ => //don't log anything + } + transaction } else Empty @@ -152,7 +178,27 @@ class Boot extends Loggable{ // Build SiteMap val sitemap = List( Menu.i("Home") / "index", - Menu.i("OAuth") / "oauth" / "authorize" //OAuth authorization page + Menu.i("Privilege Admin") / "admin" / "privilege" >> TestAccess(() => { + check(OBPUser.loggedIn_?) + }) >> LocGroup("admin") + submenus(Privilege.menus : _*), + Menu.i("OAuth") / "oauth" / "authorize", //OAuth authorization page + Menu.i("Connect") / "connect", + + Menu.i("Banks") / "banks", //no test => list of open banks + //list of open banks (banks with a least a bank account with an open account) + Menu.param[Bank]("Bank", "bank", LocalStorage.getBank _ , bank => bank.id ) / "banks" / * , + //list of open accounts in a specific bank + Menu.param[Bank]("Accounts", "accounts", LocalStorage.getBank _ , bank => bank.id ) / "banks" / * / "accounts", + + //test if the bank exists and if the user have access to management page + Menu.params[Account]("Management", "management", getAccount _ , t => List("")) / "banks" / * / "accounts" / * / "management", + + Menu.params[(List[ModeratedTransaction], View)]("Bank Account", "bank accounts", getTransactionsAndView _ , t => List("") ) + / "banks" / * / "accounts" / * / *, + + Menu.params[(ModeratedTransaction,View)]("transaction", "transaction", getTransaction _ , t => List("") ) + / "banks" / * / "accounts" / * / "transactions" / * / * ) def sitemapMutators = OBPUser.sitemapMutator @@ -189,7 +235,6 @@ class Boot extends Loggable{ /** * A temporary measure to make sure there is an owner for the account, so that someone can set permissions */ - Account.find(("holder", "Music Pictures Limited")) match{ case Full(a) => HostedAccount.find(By(HostedAccount.accountID,a.id.toString)) match { diff --git a/MavLift/src/main/scala/code/actors/EnvelopeInserter.scala b/MavLift/src/main/scala/code/actors/EnvelopeInserter.scala index c6be81ca4..ca4f6110c 100644 --- a/MavLift/src/main/scala/code/actors/EnvelopeInserter.scala +++ b/MavLift/src/main/scala/code/actors/EnvelopeInserter.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ package code.actors @@ -91,7 +94,7 @@ object EnvelopeInserter extends LiftActor with Loggable{ copiesToInsert.map(e => { val record = e.saveTheRecord() - record.get.asMediatedJValue("authorities") //authorities view gives the most information. TODO: This obviously needs to be reworked + record.get.whenAddedJson //TODO: Standardise this format with API "get" format? }) } } diff --git a/MavLift/src/main/scala/code/comet/.keep b/MavLift/src/main/scala/code/comet/.keep deleted file mode 100755 index e69de29bb..000000000 diff --git a/MavLift/src/main/scala/code/model/OAuth.scala b/MavLift/src/main/scala/code/model/OAuth.scala index 3df958926..49d32be49 100644 --- a/MavLift/src/main/scala/code/model/OAuth.scala +++ b/MavLift/src/main/scala/code/model/OAuth.scala @@ -1,29 +1,33 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany - Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Ayoub Benali : ayoub AT tesobe Dot com */ package code.model import net.liftweb.mapper._ diff --git a/MavLift/src/main/scala/code/model/dataAccess/Account.scala b/MavLift/src/main/scala/code/model/dataAccess/Account.scala index 32f92c6bc..110dfde1a 100644 --- a/MavLift/src/main/scala/code/model/dataAccess/Account.scala +++ b/MavLift/src/main/scala/code/model/dataAccess/Account.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ @@ -35,18 +38,20 @@ import net.liftweb.mongodb.JsonObject import net.liftweb.mongodb.record.MongoMetaRecord import net.liftweb.mongodb.record.field.ObjectIdPk import net.liftweb.mongodb.record.MongoRecord -import net.liftweb.mongodb.record.field.BsonRecordField +import net.liftweb.mongodb.record.field.{BsonRecordField , ObjectIdRefField} import net.liftweb.mongodb.record.field.MongoJsonObjectListField import net.liftweb.mongodb.record.field.DateField import net.liftweb.common.{ Box, Empty, Full } -import net.liftweb.mongodb.record.field.{BsonRecordListField,ObjectIdRefField} +import net.liftweb.mongodb.record.field.BsonRecordListField import net.liftweb.mongodb.record.{ BsonRecord, BsonMetaRecord } -import net.liftweb.record.field.{ StringField, BooleanField} +import net.liftweb.record.field.{ StringField, BooleanField } import net.liftweb.mongodb.{Limit, Skip} import code.model.dataAccess.OBPEnvelope._ import code.model.traits.ModeratedTransaction import code.model.traits.BankAccount import code.model.implementedTraits.{ BankAccountImpl, AccountOwnerImpl } +import net.liftweb.mongodb.BsonDSL._ + /** * There should be only one of these for every real life "this" account. TODO: Enforce this @@ -70,21 +75,22 @@ class Account extends MongoRecord[Account] with ObjectIdPk[Account] { object iban extends StringField(this, 255) object lastUpdate extends DateField(this) object otherAccounts extends BsonRecordListField(this, OtherAccount) - - def bankName : String = bankID.obj match { + + def bankName : String = bankID.obj match { case Full(bank) => bank.name.get case _ => "" } - def bankPermalink : String = bankID.obj match { + def bankPermalink : String = bankID.obj match { case Full(bank) => bank.permalink.get case _ => "" } - def baseQuery = QueryBuilder.start("obp_transaction.this_account.number").is(number.get). + + def transactionsForAccount = QueryBuilder.start("obp_transaction.this_account.number").is(number.get). put("obp_transaction.this_account.kind").is(kind.get). put("obp_transaction.this_account.bank.name").is(bankName) //find all the envelopes related to this account - def allEnvelopes: List[OBPEnvelope] = OBPEnvelope.findAll(baseQuery.get) + def allEnvelopes: List[OBPEnvelope] = OBPEnvelope.findAll(transactionsForAccount.get) def envelopes(queryParams: OBPQueryParam*): List[OBPEnvelope] = { val DefaultSortField = "obp_transaction.details.completed" @@ -99,7 +105,7 @@ class Account extends MongoRecord[Account] with ObjectIdPk[Account] { val toDate = queryParams.find(q => q.isInstanceOf[OBPToDate]).asInstanceOf[Option[OBPToDate]] val mongoParams = { - val start = baseQuery + val start = transactionsForAccount val start2 = if(fromDate.isDefined) start.put("obp_transaction.details.completed").greaterThanEquals(fromDate.get.value) else start val end = if(toDate.isDefined) start2.put("obp_transaction.details.completed").lessThanEquals(toDate.get.value) @@ -111,65 +117,6 @@ class Account extends MongoRecord[Account] with ObjectIdPk[Account] { OBPEnvelope.findAll(mongoParams, ordering, Limit(limit), Skip(offset)) } - - def getUnmediatedOtherAccountUrl(user: String, otherAccountHolder: String): Box[String] = { - for { - o <- otherAccounts.get.find(acc => { - acc.holder.get.equals(otherAccountHolder) - }) - } yield o.url.get - } - - def getMediatedOtherAccountURL(user: String, otherAccountHolder: String): Box[String] = { - val otherAccountURL = for { - o <- otherAccounts.get.find(acc => { - acc.holder.get.equals(otherAccountHolder) - }) - } yield o.url.get - - user match { - case "team" => otherAccountURL - case "board" => otherAccountURL - case "authorities" => otherAccountURL - case "my-view" => otherAccountURL - case "our-network" => otherAccountURL - case _ => Empty - } - } - - def getMediatedOtherAccountImageURL(user: String, otherAccountHolder: String): Box[String] = { - val otherAccountImageURL = for { - o <- otherAccounts.get.find(acc => { - acc.holder.get.equals(otherAccountHolder) - }) - } yield o.imageUrl.get - - user match { - case "team" => otherAccountImageURL - case "board" => otherAccountImageURL - case "authorities" => otherAccountImageURL - case "my-view" => otherAccountImageURL - case "our-network" => otherAccountImageURL - case _ => Empty - } - } - - def getMediatedOtherAccountMoreInfo(user: String, otherAccountHolder: String): Box[String] = { - val otherAccountMoreInfo = for { - o <- otherAccounts.get.find(acc => { - acc.holder.get.equals(otherAccountHolder) - }) - } yield o.moreInfo.get - - user match { - case "team" => otherAccountMoreInfo - case "board" => otherAccountMoreInfo - case "authorities" => otherAccountMoreInfo - case "my-view" => otherAccountMoreInfo - case "our-network" => otherAccountMoreInfo - case _ => Empty - } - } } object Account extends Account with MongoMetaRecord[Account] { @@ -212,6 +159,13 @@ class HostedBank extends MongoRecord[HostedBank] with ObjectIdPk[HostedBank]{ object permalink extends StringField(this, 255) object SWIFT_BIC extends StringField(this, 255) object national_identifier extends StringField(this, 255) + + def getAccount(bankAccountPermalink : String) : Box[Account] = + Account.find(("permalink" -> bankAccountPermalink) ~ ("bankID" -> id.is)) + + def isAccount(bankAccountPermalink : String) : Boolean = + Account.count(("permalink" -> bankAccountPermalink) ~ ("bankID" -> id.is)) == 1 + } -object HostedBank extends HostedBank with MongoMetaRecord[HostedBank] \ No newline at end of file +object HostedBank extends HostedBank with MongoMetaRecord[HostedBank] diff --git a/MavLift/src/main/scala/code/model/dataAccess/Connectors.scala b/MavLift/src/main/scala/code/model/dataAccess/Connectors.scala index 51e38c218..b6169a793 100644 --- a/MavLift/src/main/scala/code/model/dataAccess/Connectors.scala +++ b/MavLift/src/main/scala/code/model/dataAccess/Connectors.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ package code.model.dataAccess @@ -39,6 +42,7 @@ import net.liftweb.mapper.By import net.liftweb.mongodb.MongoDB import com.mongodb.BasicDBList import java.util.ArrayList +import org.bson.types.ObjectId object LocalStorage extends MongoDBLocalStorage @@ -67,7 +71,6 @@ trait LocalStorage extends Loggable { def getTransactions(bank: String, account: String, envelopesForAccount: Account => List[OBPEnvelope]): Box[List[Transaction]] - def allBanks : List[Bank] def getBank(name: String): Box[Bank] def getBankAccounts(bank: Bank): Set[BankAccount] @@ -110,7 +113,7 @@ class MongoDBLocalStorage extends LocalStorage { bankName_ = "", //TODO: need to add this to the json/model metadata_ = new OtherBankAccountMetadataImpl(oAcc.publicAlias.get, oAcc.privateAlias.get, oAcc.moreInfo.get, oAcc.url.get, oAcc.imageUrl.get, oAcc.openCorporatesUrl.get)) - val metadata = new TransactionMetadataImpl(env.narrative.get, env.obp_comments.get, + val metadata = new TransactionMetadataImpl(env.narrative.get, env.obp_comments.objs, (text => env.narrative(text).save), env.addComment _) val transactionType = env.obp_transaction.get.details.get.type_en.get val amount = env.obp_transaction.get.details.get.value.get.amount.get @@ -126,39 +129,52 @@ class MongoDBLocalStorage extends LocalStorage { def getTransactions(permalink: String, bankPermalink: String, envelopesForAccount: Account => List[OBPEnvelope]): Box[List[Transaction]] = { logger.debug("getTransactions for " + bankPermalink + "/" + permalink) - Account.find(("permalink" -> permalink) ~ ("bankPermalink" -> bankPermalink)) match { - case Full(account) => { - val envs = envelopesForAccount(account) - Full(envs.map(createTransaction(_, account))) - } + HostedBank.find("permalink",bankPermalink) match { + case Full (bank) => bank.getAccount(permalink) match { + case Full(account) => { + val envs = envelopesForAccount(account) + Full(envs.map(createTransaction(_, account))) + } + case _ => Empty + } case _ => Empty - } + } } def getBank(permalink: String): Box[Bank] = HostedBank.find("permalink", permalink). map( bank => new BankImpl(bank.id.toString, bank.name.get, permalink)) + def allBanks : List[Bank] = HostedBank.findAll. map(bank => new BankImpl(bank.id.toString, bank.name.get, bank.permalink.get)) def getBankAccounts(bank: Bank): Set[BankAccount] = { - val rawAccounts = Account.findAll("bankName", bank.name).toSet + val bankId = new ObjectId(bank.id) + val rawAccounts = Account.findAll(("bankID" -> bankId)).toSet rawAccounts.map(Account.toBankAccount) } //check if the bank and the accounts exist in the database def correctBankAndAccount(bank: String, account: String): Boolean = - Account.count(("permalink" -> account) ~ ("bankPermalink" -> bank)) == 1 - + HostedBank.find("permalink",bank) match { + case Full(bank) => bank.isAccount(account) + case _ => false + } def getAccount(bankpermalink: String, account: String): Box[Account] = - Account.find(("permalink" -> account) ~ ("bankPermalink" -> bankpermalink)) + HostedBank.find("permalink",bankpermalink) match { + case Full (bank) => bank.getAccount(account) + case _ => Empty + } + def getTransaction(id : String, bankPermalink : String, accountPermalink : String) : Box[Transaction] = { for{ - account <- Account.find(("permalink" -> accountPermalink) ~ ("bankPermalink" -> bankPermalink)) - envelope <- OBPEnvelope.find(id) + bank <- HostedBank.find("permalink",bankPermalink) + account <- bank.getAccount(accountPermalink) + ifTransactionsIsInAccount <- Full(account.transactionsForAccount.put("_id").is(new ObjectId(id)).get) + envelope <- OBPEnvelope.find(ifTransactionsIsInAccount) } yield createTransaction(envelope,account) } diff --git a/MavLift/src/main/scala/code/model/dataAccess/MongoConfig.scala b/MavLift/src/main/scala/code/model/dataAccess/MongoConfig.scala index 0d1d7fe72..7d699668d 100644 --- a/MavLift/src/main/scala/code/model/dataAccess/MongoConfig.scala +++ b/MavLift/src/main/scala/code/model/dataAccess/MongoConfig.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ package code.model.dataAccess diff --git a/MavLift/src/main/scala/code/model/dataAccess/OBPTransaction.scala b/MavLift/src/main/scala/code/model/dataAccess/OBPTransaction.scala index aa82d8da4..63b3d9ad2 100644 --- a/MavLift/src/main/scala/code/model/dataAccess/OBPTransaction.scala +++ b/MavLift/src/main/scala/code/model/dataAccess/OBPTransaction.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ package code.model.dataAccess @@ -45,6 +48,7 @@ import scala.util.Random import com.mongodb.QueryBuilder import com.mongodb.BasicDBObject import code.model.traits.Comment +import net.liftweb.common.Loggable /** * "Current Account View" @@ -147,14 +151,11 @@ class OBPEnvelope private() extends MongoRecord[OBPEnvelope] with ObjectIdPk[OBP * @param text The text of the comment */ def addComment(userId: Long, viewId : Long, text: String, datePosted : Date) = { - println("adding a comment from the user : "+ userId + " with this content "+ text) - println("view ID : "+viewId) - val comments = obp_comments.get - val c2 = comments ++ List(OBPComment.createRecord.userId(userId). + val comment = OBPComment.createRecord.userId(userId). textField(text). date(datePosted). - viewID(viewId)) - obp_comments(c2).saveTheRecord() + viewID(viewId).save + obp_comments(comment.id.is :: obp_comments.get ).save } lazy val theAccount = { @@ -162,10 +163,14 @@ class OBPEnvelope private() extends MongoRecord[OBPEnvelope] with ObjectIdPk[OBP val num = thisAcc.number.get val accKind = thisAcc.kind.get val bankName = thisAcc.bank.get.name.get - val qry = QueryBuilder.start("number").is(num). - put("kind").is(accKind). - put("bankName").is(bankName).get - Account.find(qry) + val accQry = QueryBuilder.start("number").is(num). + put("kind").is(accKind).get + + for { + account <- Account.find(accQry) + bank <- HostedBank.find("name", bankName) + if(bank.id.get == account.bankID.get) + } yield account } object DateDescending extends Ordering[OBPEnvelope] { @@ -186,55 +191,36 @@ class OBPEnvelope private() extends MongoRecord[OBPEnvelope] with ObjectIdPk[OBP object obp_transaction extends BsonRecordField(this, OBPTransaction) //not named comments as "comments" was used in an older mongo document version - object obp_comments extends BsonRecordListField[OBPEnvelope, OBPComment](this, OBPComment) + object obp_comments extends ObjectIdRefListField[OBPEnvelope, OBPComment](this, OBPComment) object narrative extends StringField(this, 255) - def mediated_obpComments(user: String) : Box[List[OBPComment]] = { - user match{ - case "our-network" => Full(obp_comments.get) - case "team" => Full(obp_comments.get) - case "board" => Full(obp_comments.get) - case "authorities" => Full(obp_comments.get) - case "my-view" => Full(obp_comments.get) - case _ => Empty - } - } - - def mediated_narrative(user: String) : Box[String] = { - user match{ - case "our-network" => Full(narrative.get) - case "team" => Full(narrative.get) - case "board" => Full(narrative.get) - case "authorities" => Full(narrative.get) - case "my-view" => Full(narrative.get) - case _ => Full(narrative.get) - } - } - - - def asMediatedJValue(user: String) : JObject = { - JObject(List(JField("obp_transaction", obp_transaction.get.asMediatedJValue(user,id.toString, theAccount)), - JField("obp_comments", JArray(obp_comments.get.map(comment => { + /** + * A JSON representation of the transaction to be returned when successfully added via an API call + */ + def whenAddedJson : JObject = { + JObject(List(JField("obp_transaction", obp_transaction.get.whenAddedJson(id.toString)), + JField("obp_comments", JArray(obp_comments.objs.map(comment => { JObject(List(JField("text", JString(comment.textField.is)))) }))))) } } -class OBPComment private() extends BsonRecord[OBPComment] with Comment { +class OBPComment private() extends MongoRecord[OBPComment] with ObjectIdPk[OBPComment] with Comment { def meta = OBPComment def postedBy = OBPUser.find(userId) def viewId = viewID.get def text = textField.get def datePosted = date.get + def id_ = id.is.toString object userId extends LongField(this) object viewID extends LongField(this) object textField extends StringField(this, 255) object date extends DateField(this) } -object OBPComment extends OBPComment with BsonMetaRecord[OBPComment] +object OBPComment extends OBPComment with MongoMetaRecord[OBPComment] -object OBPEnvelope extends OBPEnvelope with MongoMetaRecord[OBPEnvelope] { +object OBPEnvelope extends OBPEnvelope with MongoMetaRecord[OBPEnvelope] with Loggable { class OBPQueryParam trait OBPOrder { def orderValue : Int } @@ -333,7 +319,10 @@ object OBPEnvelope extends OBPEnvelope with MongoMetaRecord[OBPEnvelope] { updatedAccount.saveTheRecord() Full(randomAliasName) } - case _ => Empty + case _ => { + logger.warn("Account not found to create aliases for") + Empty + } } } @@ -385,11 +374,11 @@ class OBPTransaction private() extends BsonRecord[OBPTransaction]{ object other_account extends BsonRecordField(this, OBPAccount) object details extends BsonRecordField(this, OBPDetails) - def asMediatedJValue(user: String, envelopeId : String, theAccount: Option[Account]) : JObject = { + def whenAddedJson(envelopeId : String) : JObject = { JObject(List(JField("obp_transaction_uuid", JString(envelopeId)), - JField("this_account", this_account.get.asMediatedJValue(user, None)), - JField("other_account", other_account.get.asMediatedJValue(user, theAccount)), - JField("details", details.get.asMediatedJValue(user)))) + JField("this_account", this_account.get.whenAddedJson), + JField("other_account", other_account.get.whenAddedJson), + JField("details", details.get.whenAddedJson))) } } @@ -402,108 +391,20 @@ class OBPAccount private() extends BsonRecord[OBPAccount]{ object number extends StringField(this, 255) object kind extends StringField(this, 255) object bank extends BsonRecordField(this, OBPBank) - - //TODO: Access levels are currently the same across all transactions - def mediated_holder(user: String, mediator: Account) : (Box[String], Box[OBPAccount.AnAlias]) = { - val theHolder = holder.get - - def usePrivateAliasIfExists() : (Box[String], Box[OBPAccount.AnAlias])= { - val privateAlias = for{ - otheracc <- mediator.otherAccounts.get.find(o => - o.holder.get.equals(theHolder) - ) - } yield otheracc.privateAlias.get - - privateAlias match{ - case Some("") => (Full(theHolder), Empty) - case Some(a) => (Full(a), Full(OBPAccount.APrivateAlias)) - case _ => (Full(theHolder), Empty) - } - } - - def usePublicAlias() : (Box[String], Box[OBPAccount.AnAlias])= { - val publicAlias = for{ - otheracc <- mediator.otherAccounts.get.find(o => - o.holder.get.equals(theHolder) - ) - } yield otheracc.publicAlias.get - - publicAlias match{ - case Some("") => (Full(theHolder), Empty) - case Some(a) => (Full(a), Full(OBPAccount.APublicAlias)) - case _ => { - //No alias found, so don't use one - (Full(theHolder), Empty) - } - } - } - - user match{ - case "team" => (Full(theHolder), Empty) - case "board" => (Full(theHolder), Empty) - case "authorities" => (Full(theHolder), Empty) - case "my-view" => (Full(theHolder), Empty) - case "our-network" => usePrivateAliasIfExists - case _ => usePublicAlias - } - } - - //TODO: Access levels are currently the same across all transactions - def mediated_number(user: String) : Box[String] = { - user match{ - case "team" => Full(number.get) - case "board" => Full(number.get) - case "authorities" => Full(number.get) - case "my-view" => Full(number.get) - case _ => Empty - } - } - - //TODO: Access levels are currently the same across all transactions - def mediated_kind(user: String) : Box[String] = { - user match{ - case "team" => Full(kind.get) - case "board" => Full(kind.get) - case "authorities" => Full(kind.get) - case "my-view" => Full(kind.get) - case _ => Empty - } - } + /** * @param moderatingAccount a temporary way to provide the obp account whose aliases should * be used when displaying this account */ - def asMediatedJValue(user: String, moderatingAccount: Option[Account]) : JObject = { - - def rawData = { - JObject(List(JField("holder", - JObject(List( - JField("holder", JString(holder.get)), - JField("alias", JString("no"))))), - JField("number", JString(number.get)), - JField("kind", JString(kind.get)), - JField("bank", bank.get.asMediatedJValue(user)))) - } + def whenAddedJson: JObject = { - def moderate(moderator: Account) = { - val h = mediated_holder(user, moderator) - JObject(List(JField("holder", - JObject(List( - JField("holder", JString(h._1.getOrElse(""))), - JField("alias", JString(h._2 match { - case Full(OBPAccount.APublicAlias) => "public" - case Full(OBPAccount.APrivateAlias) => "private" - case _ => "no" - }))))), - JField("number", JString(mediated_number(user) getOrElse "")), - JField("kind", JString(mediated_kind(user) getOrElse "")), - JField("bank", bank.get.asMediatedJValue(user)))) - } - - moderatingAccount match { - case Some(m) => moderate(m) - case _ => rawData - } + JObject(List(JField("holder", + JObject(List( + JField("holder", JString(holder.get)), + JField("alias", JString("no"))))), + JField("number", JString(number.get)), + JField("kind", JString(kind.get)), + JField("bank", bank.get.whenAddedJson))) } } @@ -520,43 +421,11 @@ class OBPBank private() extends BsonRecord[OBPBank]{ object national_identifier extends net.liftweb.record.field.StringField(this, 255) object name extends net.liftweb.record.field.StringField(this, 255) - //TODO: Access levels are currently the same across all transactions - def mediated_IBAN(user: String) : Box[String] = { - user match{ - case "team" => Full(IBAN.get) - case "board" => Full(IBAN.get) - case "authorities" => Full(IBAN.get) - case "my-view" => Full(IBAN.get) - case _ => Empty - } - } - //TODO: Access levels are currently the same across all transactions - def mediated_national_identifier(user: String) : Box[String] = { - user match{ - case "team" => Full(national_identifier.get) - case "board" => Full(national_identifier.get) - case "authorities" => Full(national_identifier.get) - case "my-view" => Full(national_identifier.get) - case _ => Empty - } - } - - //TODO: Access levels are currently the same across all transactions - def mediated_name(user: String) : Box[String] = { - user match{ - case "team" => Full(name.get) - case "board" => Full(name.get) - case "authorities" => Full(name.get) - case "my-view" => Full(name.get) - case _ => Empty - } - } - - def asMediatedJValue(user: String) : JObject = { - JObject(List( JField("IBAN", JString(mediated_IBAN(user) getOrElse "")), - JField("national_identifier", JString(mediated_national_identifier(user) getOrElse "")), - JField("name", JString(mediated_name(user) getOrElse "")))) + def whenAddedJson : JObject = { + JObject(List( JField("IBAN", JString(IBAN.get)), + JField("national_identifier", JString(national_identifier.get)), + JField("name", JString(name.get)))) } } @@ -576,56 +445,18 @@ class OBPDetails private() extends BsonRecord[OBPDetails]{ object completed extends DateField(this) - def formatDate(date : Box[Date]) : String = { - date match{ - case Full(d) => OBPDetails.formats.dateFormat.format(d) - case _ => "" - } + def formatDate(date : Date) : String = { + OBPDetails.formats.dateFormat.format(date) } - //TODO: Access levels are currently the same across all transactions - def mediated_type_en(user: String) : Box[String] = { - user match{ - case _ => Full(type_en.get) - } - } - //TODO: Access levels are currently the same across all transactions - def mediated_type_de(user: String) : Box[String] = { - user match{ - case _ => Full(type_de.get) - } - } - //TODO: Access levels are currently the same across all transactions - def mediated_posted(user: String) : Box[Date] = { - user match{ - case _ => Full(posted.get) - } - } - //TODO: Access levels are currently the same across all transactions - def mediated_completed(user: String) : Box[Date] = { - user match{ - case _ => Full(completed.get) - } - } - //TODO: Access levels are currently the same across all transactions - def mediated_other_data(user: String) : Box[String] = { - user match{ - case "team" => Full(other_data.get) - case "board" => Full(other_data.get) - case "authorities" => Full(other_data.get) - case "my-view" => Full(other_data.get) - case _ => Empty - } - } - - def asMediatedJValue(user: String) : JObject = { - JObject(List( JField("type_en", JString(mediated_type_en(user) getOrElse "")), - JField("type_de", JString(mediated_type_de(user) getOrElse "")), - JField("posted", JString(formatDate(mediated_posted(user)))), - JField("completed", JString(formatDate(mediated_completed(user)))), - JField("other_data", JString(mediated_other_data(user) getOrElse "")), - JField("new_balance", new_balance.get.asMediatedJValue(user)), - JField("value", value.get.asMediatedJValue(user)))) + def whenAddedJson : JObject = { + JObject(List( JField("type_en", JString(type_en.get)), + JField("type_de", JString(type_de.get)), + JField("posted", JString(formatDate(posted.get))), + JField("completed", JString(formatDate(completed.get))), + JField("other_data", JString(other_data.get)), + JField("new_balance", new_balance.get.whenAddedJson), + JField("value", value.get.whenAddedJson))) } } @@ -638,37 +469,9 @@ class OBPBalance private() extends BsonRecord[OBPBalance]{ object currency extends net.liftweb.record.field.StringField(this, 5) object amount extends net.liftweb.record.field.DecimalField(this, 0) // ok to use decimal? - //TODO: Access levels are currently the same across all transactions - def mediated_currency(user: String) : Box[String] = { - user match{ - case "our-network" => Full(currency.get) - case "team" => Full(currency.get) - case "board" => Full(currency.get) - case "authorities" => Full(currency.get) - case "my-view" => Full(currency.get) - case _ => Empty - } - } - //TODO: Access levels are currently the same across all transactions - /** - * TODO: This should probably return an actual decimal rather than a string -E.S. - */ - def mediated_amount(user: String) : Box[String] = { - user match{ - case "our-network" => Full(amount.get.toString) - case "team" => Full(amount.get.toString) - case "board" => Full(amount.get.toString) - case "authorities" => Full(amount.get.toString) - case "my-view" => Full(amount.get.toString) - case _ => { - if(amount.get.toString.startsWith("-")) Full("-") else Full("+") - } - } - } - - def asMediatedJValue(user: String) : JObject = { - JObject(List( JField("currency", JString(mediated_currency(user) getOrElse "")), - JField("amount", JString(mediated_amount(user) getOrElse "")))) + def whenAddedJson : JObject = { + JObject(List( JField("currency", JString(currency.get)), + JField("amount", JString(amount.get.toString)))) } } @@ -679,26 +482,10 @@ class OBPValue private() extends BsonRecord[OBPValue]{ object currency extends net.liftweb.record.field.StringField(this, 5) object amount extends net.liftweb.record.field.DecimalField(this, 0) // ok to use decimal? - - //TODO: Access levels are currently the same across all transactions - def mediated_currency(user: String) : Box[String] = { - user match{ - case _ => Full(currency.get.toString) - } - } - //TODO: Access levels are currently the same across all transactions - /** - * TODO: This should probably return an actual decimal rather than a string -E.S. - */ - def mediated_amount(user: String) : Box[String] = { - user match{ - case _ => Full(amount.get.toString) - } - } - def asMediatedJValue(user: String) : JObject = { - JObject(List( JField("currency", JString(mediated_currency(user) getOrElse "")), - JField("amount", JString(mediated_amount(user) getOrElse "")))) + def whenAddedJson : JObject = { + JObject(List( JField("currency", JString(currency.get)), + JField("amount", JString(amount.get.toString)))) } } diff --git a/MavLift/src/main/scala/code/model/dataAccess/OBPUser.scala b/MavLift/src/main/scala/code/model/dataAccess/OBPUser.scala index e79a8aa83..e277416b3 100755 --- a/MavLift/src/main/scala/code/model/dataAccess/OBPUser.scala +++ b/MavLift/src/main/scala/code/model/dataAccess/OBPUser.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ package code.model.dataAccess @@ -53,7 +56,7 @@ import net.liftweb.json.JsonAST.JObject */ class OBPUser extends MegaProtoUser[OBPUser] with User{ def getSingleton = OBPUser // what's the "meta" server - + def id_ = id.is.toString def emailAddress = email.get def theFistName : String = firstName.get def theLastName : String = lastName.get @@ -133,6 +136,26 @@ object OBPUser extends OBPUser with MetaMegaProtoUser[OBPUser]{ ret } + override def loginXhtml = { + import net.liftweb.http.TemplateFinder + import net.liftweb.http.js.JsCmds.Noop + val loginXml = TemplateFinder.findAnyTemplate(List("templates-hidden","_login")).map({ + "form [action]" #> {S.uri} & + "#loginText * " #> {S.??("log.in")} & + "#emailAddressText * " #> {S.??("email.address")} & + "#passwordText * " #> {S.??("password")} & + "#recoverPasswordLink * " #> { + "a [href]" #> {lostPasswordPath.mkString("/", "/", "")} & + "a *" #> {S.??("recover.password")} + } & + "#SignUpLink * " #> { + "a [href]" #> {OBPUser.signUpPath.foldLeft("")(_ + "/" + _)} & + "a *" #> {S.??("sign.up")} + } + }) + SHtml.span(loginXml getOrElse NodeSeq.Empty,Noop) + } + //Set the login referer override def login = { for(r <- S.referer if loginReferer.is.equals("/")) loginReferer.set(r) diff --git a/MavLift/src/main/scala/code/model/implementedTraits/AccountOwnerImpl.scala b/MavLift/src/main/scala/code/model/implementedTraits/AccountOwnerImpl.scala index 935c73387..cd1d1bdf1 100644 --- a/MavLift/src/main/scala/code/model/implementedTraits/AccountOwnerImpl.scala +++ b/MavLift/src/main/scala/code/model/implementedTraits/AccountOwnerImpl.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ package code.model.implementedTraits diff --git a/MavLift/src/main/scala/code/model/implementedTraits/BankAccountImpl.scala b/MavLift/src/main/scala/code/model/implementedTraits/BankAccountImpl.scala index 88e4b7500..e1fd8dda3 100644 --- a/MavLift/src/main/scala/code/model/implementedTraits/BankAccountImpl.scala +++ b/MavLift/src/main/scala/code/model/implementedTraits/BankAccountImpl.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ package code.model.implementedTraits diff --git a/MavLift/src/main/scala/code/model/implementedTraits/BankImpl.scala b/MavLift/src/main/scala/code/model/implementedTraits/BankImpl.scala index ebc34b7db..d6621f52e 100644 --- a/MavLift/src/main/scala/code/model/implementedTraits/BankImpl.scala +++ b/MavLift/src/main/scala/code/model/implementedTraits/BankImpl.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ package code.model.implementedTraits diff --git a/MavLift/src/main/scala/code/model/implementedTraits/MetadataImpl.scala b/MavLift/src/main/scala/code/model/implementedTraits/MetadataImpl.scala index e97114828..46b1fc21b 100644 --- a/MavLift/src/main/scala/code/model/implementedTraits/MetadataImpl.scala +++ b/MavLift/src/main/scala/code/model/implementedTraits/MetadataImpl.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ package code.model.implementedTraits diff --git a/MavLift/src/main/scala/code/model/implementedTraits/OtherBankAccountImpl.scala b/MavLift/src/main/scala/code/model/implementedTraits/OtherBankAccountImpl.scala index ef14746e3..11fa9d539 100644 --- a/MavLift/src/main/scala/code/model/implementedTraits/OtherBankAccountImpl.scala +++ b/MavLift/src/main/scala/code/model/implementedTraits/OtherBankAccountImpl.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ package code.model.implementedTraits diff --git a/MavLift/src/main/scala/code/model/implementedTraits/TransactionImpl.scala b/MavLift/src/main/scala/code/model/implementedTraits/TransactionImpl.scala index c44d37431..e1a08f3f0 100644 --- a/MavLift/src/main/scala/code/model/implementedTraits/TransactionImpl.scala +++ b/MavLift/src/main/scala/code/model/implementedTraits/TransactionImpl.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ package code.model.implementedTraits diff --git a/MavLift/src/main/scala/code/model/implementedTraits/ViewsImpl.scala b/MavLift/src/main/scala/code/model/implementedTraits/ViewsImpl.scala index 7b0841061..5710f9c34 100644 --- a/MavLift/src/main/scala/code/model/implementedTraits/ViewsImpl.scala +++ b/MavLift/src/main/scala/code/model/implementedTraits/ViewsImpl.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ @@ -31,19 +34,32 @@ package code.model.implementedTraits import code.model.traits._ import net.liftweb.common.{Box,Empty, Full} -object View -{ +import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonAST.JObject + +object View { //transforme the url into a view //TODO : load the view from the Data base - def fromUrl(viewNameURL: String): Box[View] = - viewNameURL match { - case "authorities" => Full(Authorities) - case "board" => Full(Board) - case "our-network" => Full(OurNetwork) - case "team" => Full(Team) - case "owner" => Full(Owner) - case "anonymous" => Full(Anonymous) - case _ => Empty + def fromUrl(viewNameURL: String): Box[View] = + viewNameURL match { + case "authorities" => Full(Authorities) + case "board" => Full(Board) + case "our-network" => Full(OurNetwork) + case "team" => Full(Team) + case "owner" => Full(Owner) + case "anonymous" => Full(Anonymous) + case _ => Empty + } + + def linksJson(views: Set[View], accountPermalink: String, bankPermalink: String): JObject = { + val viewsJson = views.map(view => { + ("rel" -> "account") ~ + ("href" -> { "/" + bankPermalink + "/account/" + accountPermalink + "/" + view.permalink }) ~ + ("method" -> "GET") ~ + ("title" -> "Get information about one account") + }) + + ("links" -> viewsJson) } } object Team extends FullView { @@ -84,12 +100,28 @@ object Anonymous extends BaseView { override def name = "Anonymous" override def permalink = "anonymous" override def description = "A view of the account accessible by anyone." + + //Bank account fields + override def canSeeBankAccountOwners = true + override def canSeeBankAccountType = true + override def canSeeBankAccountBalancePositiveOrNegative = true + override def canSeeBankAccountCurrency = true + override def canSeeBankAccountLabel = true + override def canSeeBankAccountNationalIdentifier = true + override def canSeeBankAccountSwift_bic = true + override def canSeeBankAccountIban = true + override def canSeeBankAccountNumber = true + override def canSeeBankAccountName = true + override def moderate(transaction: Transaction): ModeratedTransaction = { val transactionId = transaction.id //toString().startsWith("-")) "-" else "+" + val accountBalance = "" //not used when displaying transactions, but we might eventually need it. if so, we need a ref to + //the bank account so we could do something like if(canSeeBankAccountBalance) bankAccount.balance else if + // canSeeBankAccountBalancePositiveOrNegative {show + or -} else "" val thisBankAccount = Some(new ModeratedBankAccount(transaction.thisAccount.id, Some(transaction.thisAccount.owners), Some(transaction.thisAccount.accountType), - if(transaction.thisAccount.toString().startsWith("-")) "-" else "+", Some(transaction.thisAccount.currency), + accountBalance, Some(transaction.thisAccount.currency), Some(transaction.thisAccount.label),None, None, None, Some(transaction.thisAccount.number), Some(transaction.thisAccount.bankName))) val otherBankAccount = { @@ -144,8 +176,11 @@ object Anonymous extends BaseView { " or current/potential clients" override def moderate(transaction: Transaction): ModeratedTransaction = { val transactionId = transaction.id + val accountBalance = "" //not used when displaying transactions, but we might eventually need it. if so, we need a ref to + //the bank account so we could do something like if(canSeeBankAccountBalance) bankAccount.balance else if + // canSeeBankAccountBalancePositiveOrNegative {show + or -} else "" val thisBankAccount = Some(new ModeratedBankAccount(transaction.thisAccount.id, None, None, - transaction.thisAccount.toString(), Some(transaction.thisAccount.currency), + accountBalance, Some(transaction.thisAccount.currency), Some(transaction.thisAccount.label),None, None, None, Some(transaction.thisAccount.number), Some(transaction.thisAccount.bankName))) val otherBankAccount = { diff --git a/MavLift/src/main/scala/code/model/traits/AccountOwner.scala b/MavLift/src/main/scala/code/model/traits/AccountOwner.scala index 858b16684..f89c3cc8d 100644 --- a/MavLift/src/main/scala/code/model/traits/AccountOwner.scala +++ b/MavLift/src/main/scala/code/model/traits/AccountOwner.scala @@ -1,3 +1,35 @@ +/** +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com + + */ + package code.model.traits trait AccountOwner { diff --git a/MavLift/src/main/scala/code/model/traits/Bank.scala b/MavLift/src/main/scala/code/model/traits/Bank.scala index 036b1b400..7cb3c526e 100644 --- a/MavLift/src/main/scala/code/model/traits/Bank.scala +++ b/MavLift/src/main/scala/code/model/traits/Bank.scala @@ -1,6 +1,41 @@ +/** +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com + + */ + package code.model.traits import net.liftweb.common.Box import code.model.dataAccess.LocalStorage +import net.liftweb.json.JsonAST.JObject +import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonAST.JArray trait Bank { @@ -8,10 +43,34 @@ trait Bank def name : String def permalink : String def accounts : Set[BankAccount] + + def detailedJson : JObject = { + ("name" -> name) ~ + ("website" -> "") ~ + ("email" -> "") + } + + def toJson : JObject = { + ("alias" -> permalink) ~ + ("name" -> name) ~ + ("logo" -> "") ~ + ("links" -> linkJson) + } + + def linkJson : JObject = { + ("rel" -> "bank") ~ + ("href" -> {"/" + permalink + "/bank"}) ~ + ("method" -> "GET") ~ + ("title" -> {"Get information about the bank identified by " + permalink}) + } } object Bank { def apply(bankPermalink: String) : Box[Bank] = LocalStorage.getBank(bankPermalink) def all : List[Bank] = LocalStorage.allBanks + + def toJson(banks: Seq[Bank]) : JArray = + banks.map(bank => bank.toJson) + } \ No newline at end of file diff --git a/MavLift/src/main/scala/code/model/traits/BankAccount.scala b/MavLift/src/main/scala/code/model/traits/BankAccount.scala index d89d9a44b..3b8d468ce 100644 --- a/MavLift/src/main/scala/code/model/traits/BankAccount.scala +++ b/MavLift/src/main/scala/code/model/traits/BankAccount.scala @@ -1,3 +1,35 @@ +/** +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com + + */ + package code.model.traits import scala.math.BigDecimal import java.util.Date @@ -11,6 +43,7 @@ import net.liftweb.json.JObject import net.liftweb.json.JsonDSL._ import net.liftweb.http.LiftResponse import net.liftweb.http.JsonResponse +import code.model.implementedTraits.View trait BankAccount { @@ -46,6 +79,18 @@ trait BankAccount { def transaction(id: String) : Box[Transaction] + def moderatedTransaction(id: String, view: View, user: Box[User]) : Box[ModeratedTransaction] = { + if(permittedViews(user).contains(view)) { + transaction(id).map(view.moderate) + } else Empty + } + + def moderatedBankAccount(view: View, user: Box[User]) : Box[ModeratedBankAccount] = { + if(permittedViews(user).contains(view)){ + view.moderate(this) + } else Empty + } + //Is an anonymous view available for this bank account def allowAnnoymousAccess : Boolean @@ -56,6 +101,15 @@ trait BankAccount { def getModeratedTransactions(queryParams: OBPQueryParam*)(moderate: Transaction => ModeratedTransaction): List[ModeratedTransaction] def authorisedAccess(view: View, user: Option[OBPUser]) : Boolean + + def overviewJson(user: Box[User]): JObject = { + val views = permittedViews(user) + ("number" -> number) ~ + ("account_alias" -> label) ~ + ("owner_description" -> "") ~ + ("views_available" -> views.map(view => view.toJson)) ~ + View.linksJson(views, permalink, bankPermalink) + } } object BankAccount { @@ -73,4 +127,5 @@ object BankAccount { def publicAccounts : List[BankAccount] = { LocalStorage.getAllPublicAccounts() map Account.toBankAccount } + } \ No newline at end of file diff --git a/MavLift/src/main/scala/code/model/traits/Comment.scala b/MavLift/src/main/scala/code/model/traits/Comment.scala index 33f133a6c..8a03a650a 100644 --- a/MavLift/src/main/scala/code/model/traits/Comment.scala +++ b/MavLift/src/main/scala/code/model/traits/Comment.scala @@ -1,8 +1,43 @@ +/** +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com + + */ + package code.model.traits import java.util.Date -import net.liftweb.common.Box +import net.liftweb.common.{Box,Full} +import net.liftweb.json.JsonAST.JObject +import net.liftweb.json.JsonDSL._ trait Comment { + def id_ : String // The person that posted the comment def postedBy : Box[User] @@ -13,4 +48,20 @@ trait Comment { def text : String def datePosted : Date + + def toJson : JObject = { + val userInJson = postedBy match { + case Full(user) => user.toJson + case _ => ("id" -> "") ~ + ("provider" -> "") ~ + ("display_name" -> "") + } + + ("id" -> id_) ~ + ("date" -> datePosted.toString) ~ + ("comment" -> text) ~ + ("view" -> viewId) ~ + ("user" -> userInJson) ~ + ("reply_to" -> "") + } } \ No newline at end of file diff --git a/MavLift/src/main/scala/code/model/traits/Metadata.scala b/MavLift/src/main/scala/code/model/traits/Metadata.scala index 08bd8238f..453e4ce00 100644 --- a/MavLift/src/main/scala/code/model/traits/Metadata.scala +++ b/MavLift/src/main/scala/code/model/traits/Metadata.scala @@ -1,3 +1,35 @@ +/** +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com + + */ + package code.model.traits import java.util.Date diff --git a/MavLift/src/main/scala/code/model/traits/Moderated.scala b/MavLift/src/main/scala/code/model/traits/Moderated.scala index d2b9b8fe4..b726c8932 100644 --- a/MavLift/src/main/scala/code/model/traits/Moderated.scala +++ b/MavLift/src/main/scala/code/model/traits/Moderated.scala @@ -1,3 +1,35 @@ +/** +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com + + */ + package code.model.traits import java.util.Date import net.liftweb.json.JsonAST.JObject @@ -78,36 +110,32 @@ class ModeratedTransaction(filteredId: String, filteredBankAccount: Option[Moder def startDate = filteredStartDate def finishDate = filteredFinishDate def balance = filteredBalance + + def dateOption2JString(date: Option[Date]) : JString = { + JString(date.map(d => ModeratedTransaction.dateFormat.format(d)) getOrElse "") + } + + def toJson(view: View): JObject = { + ("view" -> view.permalink) ~ + ("uuid" -> id) ~ + ("this_account" -> bankAccount) ~ + ("other_account" -> otherBankAccount) ~ + ("details" -> + ("type_en" -> transactionType) ~ //TODO: Need translations for transaction types and a way to + ("type_de" -> transactionType) ~ // figure out what language the original type is in + ("posted" -> dateOption2JString(startDate)) ~ + ("completed" -> dateOption2JString(finishDate)) ~ + ("new_balance" -> + ("currency" -> currency.getOrElse("")) ~ //TODO: Need separate currency for balances and values? + ("amount" -> balance)) ~ + ("value" -> + ("currency" -> currency.getOrElse("")) ~ + ("amount" -> amount))) + } } object ModeratedTransaction { - val dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ") - - implicit def dateOption2JString(date: Option[Date]) : JString = { - JString(date.map(d => dateFormat.format(d)) getOrElse "") - } - - implicit def moderatedTransaction2Json(mTransaction: ModeratedTransaction) : JObject = { - ("uuid" -> mTransaction.id) ~ - ("this_account" -> mTransaction.bankAccount) ~ - ("other_account" -> mTransaction.otherBankAccount) ~ - ("details" -> - ("type_en" -> mTransaction.transactionType) ~ //TODO: Need translations for transaction types and a way to - ("type_de" -> mTransaction.transactionType) ~ // figure out what language the original type is in - ("posted" -> mTransaction.startDate) ~ - ("completed" -> mTransaction.finishDate) ~ - ("new_balance" -> - ("currency" -> mTransaction.currency.getOrElse("")) ~ //TODO: Need separate currency for balances and values? - ("amount" -> mTransaction.balance)) ~ - ("value" -> - ("currency" -> mTransaction.currency.getOrElse("")) ~ - ("amount" -> mTransaction.amount))) - } - - implicit def moderatedTransactions2Json(mTransactions: List[ModeratedTransaction]) : LiftResponse = { - JsonResponse(("transactions" -> mTransactions)) - } } class ModeratedTransactionMetadata(filteredOwnerComment : Option[String], filteredComments : Option[List[Comment]], @@ -147,6 +175,22 @@ class ModeratedBankAccount(filteredId : String, def iban = filteredIban def number = filteredNumber def bankName = filteredBankName + + def toJson = { + //TODO: Decide if unauthorised info (I guess that is represented by a 'none' option'? I can't really remember) + // should just disappear from the json or if an empty string should be used. + //I think we decided to use empty strings. What was the point of all the options again? + ("number" -> number.getOrElse("")) ~ + ("owners" -> owners.flatten.map(owner => + ("id" ->owner.id) ~ + ("name" -> owner.name))) ~ + ("type" -> accountType.getOrElse("")) ~ + ("balance" -> + ("currency" -> currency.getOrElse("")) ~ + ("amount" -> balance)) ~ + ("IBAN" -> iban.getOrElse(Some(""))) ~ + ("date_opened" -> "") + } } object ModeratedBankAccount { diff --git a/MavLift/src/main/scala/code/model/traits/OtherBankAccount.scala b/MavLift/src/main/scala/code/model/traits/OtherBankAccount.scala index aa64648c3..fd238b718 100644 --- a/MavLift/src/main/scala/code/model/traits/OtherBankAccount.scala +++ b/MavLift/src/main/scala/code/model/traits/OtherBankAccount.scala @@ -1,3 +1,35 @@ +/** +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com + + */ + package code.model.traits trait OtherBankAccount { diff --git a/MavLift/src/main/scala/code/model/traits/Transaction.scala b/MavLift/src/main/scala/code/model/traits/Transaction.scala index 5ec68f1c8..b35b52fdb 100644 --- a/MavLift/src/main/scala/code/model/traits/Transaction.scala +++ b/MavLift/src/main/scala/code/model/traits/Transaction.scala @@ -1,3 +1,35 @@ +/** +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com + + */ + package code.model.traits import scala.math.BigDecimal import java.util.Date diff --git a/MavLift/src/main/scala/code/model/traits/User.scala b/MavLift/src/main/scala/code/model/traits/User.scala index 1d95f18ed..5e1b31efc 100644 --- a/MavLift/src/main/scala/code/model/traits/User.scala +++ b/MavLift/src/main/scala/code/model/traits/User.scala @@ -1,12 +1,50 @@ +/** +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com + + */ + package code.model.traits +import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonAST.JObject + trait User { - + def id_ : String def emailAddress : String def theFistName : String def theLastName : String def permittedViews(bankAccount: BankAccount) : Set[View] def hasMangementAccess(bankAccount: BankAccount) : Boolean def accountsWithMoreThanAnonAccess : Set[BankAccount] - + def toJson : JObject = + ("id" -> id_) ~ + ("provider" -> "sofi.openbankproject.com") ~ + ("display_name" -> {theFistName + " " + theLastName}) } \ No newline at end of file diff --git a/MavLift/src/main/scala/code/model/traits/View.scala b/MavLift/src/main/scala/code/model/traits/View.scala index b2ca55631..99d399696 100644 --- a/MavLift/src/main/scala/code/model/traits/View.scala +++ b/MavLift/src/main/scala/code/model/traits/View.scala @@ -1,6 +1,44 @@ +/** +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com + + */ + + package code.model.traits import code.snippet.CustomEditable import net.liftweb.http.SHtml +import net.liftweb.json.JsonDSL._ +import net.liftweb.json.JsonAST.JObject +import net.liftweb.common.Box +import net.liftweb.common.Empty +import net.liftweb.common.Full class AliasType class Alias extends AliasType @@ -43,6 +81,7 @@ trait View { def canSeeBankAccountOwners : Boolean def canSeeBankAccountType : Boolean def canSeeBankAccountBalance : Boolean + def canSeeBankAccountBalancePositiveOrNegative : Boolean def canSeeBankAccountCurrency : Boolean def canSeeBankAccountLabel : Boolean def canSeeBankAccountNationalIdentifier : Boolean @@ -80,7 +119,11 @@ trait View { { val owners = if(canSeeBankAccountOwners) Some(transaction.thisAccount.owners) else None val accountType = if(canSeeBankAccountType) Some(transaction.thisAccount.accountType) else None - val balance = if(canSeeBankAccountBalance) transaction.thisAccount.balance.toString else "" + val balance = if(canSeeBankAccountBalance) { + transaction.thisAccount.balance.toString + } else if (canSeeBankAccountBalancePositiveOrNegative) { + if(transaction.thisAccount.balance.toString.startsWith("-")) "-" else "+" + } else "" val currency = if(canSeeBankAccountCurrency) Some(transaction.thisAccount.currency) else None val label = if(canSeeBankAccountLabel) Some(transaction.thisAccount.label) else None val number = if(canSeeBankAccountNumber) Some(transaction.thisAccount.number) else None @@ -211,6 +254,45 @@ trait View { transactionType, transactionAmount, transactionCurrency, transactionLabel, transactionStartDate, transactionFinishDate, transactionBalance) } + + def moderate(bankAccount: BankAccount) : Box[ModeratedBankAccount] = { + if(bankAccount.allowAnnoymousAccess) { + val owners : Set[AccountOwner] = if(canSeeBankAccountOwners) bankAccount.owners else Set() + val balance = if(canSeeBankAccountBalance){ + bankAccount.balance.toString + } else if(canSeeBankAccountBalancePositiveOrNegative) { + if(bankAccount.balance.toString.startsWith("-")) "-" else "+" + } else "" + val accountType = if(canSeeBankAccountType) Some(bankAccount.accountType) else None + val currency = if(canSeeBankAccountCurrency) Some(bankAccount.currency) else None + val label = if(canSeeBankAccountLabel) Some(bankAccount.label) else None + val nationalIdentifier = if(canSeeBankAccountNationalIdentifier) Some(bankAccount.label) else None + val swiftBic = if(canSeeBankAccountSwift_bic) Some(bankAccount.swift_bic) else None + val iban = if(canSeeBankAccountIban) Some(bankAccount.iban) else None + val number = if(canSeeBankAccountNumber) Some(bankAccount.number) else None + val bankName = if(canSeeBankAccountName) Some(bankAccount.bankName) else None + + Full(new ModeratedBankAccount(filteredId = bankAccount.id, + filteredOwners = Some(owners), + filteredAccountType = accountType, + filteredBalance = balance, + filteredCurrency = currency, + filteredLabel = label, + filteredNationalIdentifier = nationalIdentifier, + filteredSwift_bic = swiftBic, + filteredIban = iban, + filteredNumber = number, + filteredBankName = bankName + )) + } + else Empty + } + + def toJson : JObject = { + ("name" -> name) ~ + ("description" -> description) + } + } //An implementation that has the least amount of permissions possible @@ -246,6 +328,7 @@ class BaseView extends View { def canSeeBankAccountOwners = false def canSeeBankAccountType = false def canSeeBankAccountBalance = false + def canSeeBankAccountBalancePositiveOrNegative = false def canSeeBankAccountCurrency = false def canSeeBankAccountLabel = false def canSeeBankAccountNationalIdentifier = false @@ -306,6 +389,7 @@ class FullView extends View { def canSeeBankAccountOwners = true def canSeeBankAccountType = true def canSeeBankAccountBalance = true + def canSeeBankAccountBalancePositiveOrNegative = true def canSeeBankAccountCurrency = true def canSeeBankAccountLabel = true def canSeeBankAccountNationalIdentifier = true diff --git a/MavLift/src/main/scala/code/snippet/CustomEditable.scala b/MavLift/src/main/scala/code/snippet/CustomEditable.scala index c1bbba36b..874f343bc 100644 --- a/MavLift/src/main/scala/code/snippet/CustomEditable.scala +++ b/MavLift/src/main/scala/code/snippet/CustomEditable.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ diff --git a/MavLift/src/main/scala/code/snippet/Login.scala b/MavLift/src/main/scala/code/snippet/Login.scala index 635385f92..da35a4c6e 100644 --- a/MavLift/src/main/scala/code/snippet/Login.scala +++ b/MavLift/src/main/scala/code/snippet/Login.scala @@ -1,29 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany -Open Bank Project (http://www.openbankproject.com) - Copyright 2011,2012 TESOBE / Music Pictures Ltd - - This product includes software developed at - TESOBE (http://www.tesobe.com/) - by - Simon Redfern : simon AT tesobe DOT com - Everett Sochowski: everett AT tesobe DOT com - Benali Ayoub : ayoub AT tesobe DOT com + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ @@ -57,7 +60,7 @@ class Login { ".login [action]" #> OBPUser.loginPageURL & ".forgot [href]" #> { val href = for { - menu <- OBPUser.resetPasswordMenuLoc + menu <- OBPUser.lostPasswordMenuLoc } yield menu.loc.calcDefaultHref href getOrElse "#" } & { diff --git a/MavLift/src/main/scala/code/snippet/OBPREST.scala b/MavLift/src/main/scala/code/snippet/OBPREST.scala index 317277c41..3ffacb060 100644 --- a/MavLift/src/main/scala/code/snippet/OBPREST.scala +++ b/MavLift/src/main/scala/code/snippet/OBPREST.scala @@ -1,30 +1,33 @@ -/** - * Open Bank Project - * - * Copyright 2011,2012 TESOBE / Music Pictures Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Open Bank Project (http://www.openbankproject.com) - * Copyright 2011,2012 TESOBE / Music Pictures Ltd - * - * This product includes software developed at - * TESOBE (http://www.tesobe.com/) - * by - * Simon Redfern : simon AT tesobe DOT com - * Everett Sochowski: everett AT tesobe DOT com - * Ayoub Benali : ayoub AT tesobe DOT com - * +/** +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com + */ package com.tesobe.utils { @@ -73,16 +76,13 @@ import code.model.implementedTraits.Anonymous import code.model.traits.Bank import code.model.traits.User import java.util.Date - - // Note: on mongo console db.chooseitems.ensureIndex( { location : "2d" } ) - - // Call like http://localhost:8080/api/balance/theaccountnumber/call.json - // See http://www.assembla.com/spaces/liftweb/wiki/REST_Web_Services +import code.snippet.OAuthHandshake._ +import code.model.traits.ModeratedBankAccount object OBPRest extends RestHelper with Loggable { - val dateFormat = ModeratedTransaction.dateFormat - private def getUser(httpCode : Int, tokenID : Box[String]) : Box[OBPUser] = + val dateFormat = ModeratedTransaction.dateFormat + private def getUser(httpCode : Int, tokenID : Box[String]) : Box[OBPUser] = if(httpCode==200) { import code.model.Token @@ -92,21 +92,50 @@ import java.util.Date } } else - Empty - + Empty + serve("obp" / "v1.0" prefix { + + case Nil JsonGet json => { + + def gitCommit : String = { + val commit = tryo{ + val properties = new java.util.Properties() + properties.load(getClass().getClassLoader().getResourceAsStream("git.properties")) + properties.getProperty("git.commit.id", "") + } + commit getOrElse "" + } + + val apiDetails = { + ("api" -> + ("version" -> "1.0") ~ + ("git_commit" -> gitCommit) ~ + ("hosted_by" -> + ("organisation" -> "TESOBE") ~ + ("email" -> "contact@tesobe.com") ~ + ("phone" -> "+49 (0)30 8145 3994"))) ~ + ("links" -> + ("rel" -> "banks") ~ + ("href" -> "/banks") ~ + ("method" -> "GET") ~ + ("title" -> "Returns a list of banks supported on this server")) + } + + JsonResponse(apiDetails) + } + case bankAlias :: "accounts" :: accountAlias :: "transactions" :: viewName :: Nil JsonGet json => { import code.snippet.OAuthHandshake._ val (httpCode, data, oAuthParameters) = validator("protectedResource", "GET") val headers = ("Content-type" -> "application/x-www-form-urlencoded") :: Nil - + def asInt(s: Box[String], default: Int): Int = { s match { case Full(str) => tryo { str.toInt } getOrElse default case _ => default } } - val bankAccount = BankAccount(bankAlias, accountAlias) val limit = asInt(json.header("obp_limit"), 50) val offset = asInt(json.header("obp_offset"), 0) /** @@ -137,49 +166,65 @@ import java.util.Date } else Nil } - val transactions = for { - b <- bankAccount - v <- View.fromUrl(viewName) //TODO: This will have to change if we implement custom view names for different accounts - } yield getTransactions(b, v, getUser(httpCode,oAuthParameters.get("oauth_token"))) - - transactions match { - case Full(t) => t - case _ => InMemoryResponse(data, headers, Nil, 401) + val response = for { + bankAccount <- BankAccount(bankAlias, accountAlias) + view <- View.fromUrl(viewName) //TODO: This will have to change if we implement custom view names for different accounts + } yield { + val ts = getTransactions(bankAccount, view, getUser(httpCode,oAuthParameters.get("oauth_token"))) + JsonResponse("transactions" -> ts.map(t => t.toJson(view))) } + + response getOrElse InMemoryResponse(data, headers, Nil, 401) : LiftResponse + } + + case bankAlias :: "accounts" :: accountAlias :: "transactions" :: + transactionID :: "transaction" :: viewName :: Nil JsonGet json => { + + val (httpCode, data, oAuthParameters) = validator("protectedResource", "GET") + val user = getUser(httpCode,oAuthParameters.get("oauth_token")) + + val moderatedTransactionAndView = for { + bank <- Bank(bankAlias) ?~ { "bank " + bankAlias + " not found"} ~> 404 + account <- BankAccount(bankAlias, accountAlias) ?~ { "account " + accountAlias + " not found for bank"} ~> 404 + view <- View.fromUrl(viewName) ?~ { "view " + viewName + " not found for account"} ~> 404 + moderatedTransaction <- account.moderatedTransaction(transactionID, view, user) ?~ "view/transaction not authorised" ~> 401 + } yield { + (moderatedTransaction, view) + } + + val links : List[JObject] = Nil + + moderatedTransactionAndView.map(mtAndView => JsonResponse(("transaction" -> mtAndView._1.toJson(mtAndView._2)) ~ + ("links" -> links))) + } + + case bankAlias :: "accounts" :: accountAlias :: "transactions" :: + transactionID :: "comments" :: viewName :: Nil JsonGet json => { + + val (httpCode, data, oAuthParameters) = validator("protectedResource", "GET") + val user = getUser(httpCode,oAuthParameters.get("oauth_token")) + + val comments = for { + bank <- Bank(bankAlias) ?~ { "bank " + bankAlias + " not found"} ~> 404 + account <- BankAccount(bankAlias, accountAlias) ?~ { "account " + accountAlias + " not found for bank"} ~> 404 + view <- View.fromUrl(viewName) ?~ { "view " + viewName + " not found for account"} ~> 404 + moderatedTransaction <- account.moderatedTransaction(transactionID, view, user) ?~ "view/transaction not authorised" ~> 401 + comments <- Box(moderatedTransaction.metadata).flatMap(_.comments) ?~ "transaction metadata not authorised" ~> 401 + } yield comments + + val links : List[JObject] = Nil + + comments.map(cs => JsonResponse(("comments" -> cs.map(_.toJson)) ~ + ("links" -> links))) } case bankPermalink :: "accounts" :: Nil JsonGet json => { - import code.snippet.OAuthHandshake._ val (httpCode, data, oAuthParameters) = validator("protectedResource", "GET") val headers = ("Content-type" -> "application/x-www-form-urlencoded") :: Nil val user = getUser(httpCode,oAuthParameters.get("oauth_token")) def bankAccountSet2JsonResponse(bankAccounts: Set[BankAccount]): LiftResponse = { - - def view2Json(view: View) : JObject = { - ("name" -> view.name) ~ - ("description" -> view.description) - } - - def views2LinksJson(views: Set[View], accPermalink: String): JObject = { - val viewsJson = views.map(view => { - ("rel" -> "account") ~ - ("href" -> {"/" + bankPermalink + "/account/" + accPermalink + "/" + view.permalink}) ~ - ("method" -> "GET") ~ - ("title" -> "Get information about one account") - }) - ("links" -> viewsJson) - } - - val accJson = bankAccounts.map(bAcc => { - val views = bAcc.permittedViews(user) - ("number" -> bAcc.number) ~ - ("account_alias" -> bAcc.label) ~ - ("owner_description" -> "") ~ - ("views_available" -> views.map(view2Json)) ~ - views2LinksJson(views, bAcc.permalink) - }) - + val accJson = bankAccounts.map(bAcc => bAcc.overviewJson(user)) JsonResponse(("accounts" -> accJson)) } @@ -198,28 +243,74 @@ import java.util.Date } } } - case "banks" :: Nil JsonGet json => { - val banks = Bank.all + + case bankAlias :: "accounts" :: accountAlias :: "account" :: viewName :: Nil JsonGet json => { + val (httpCode, data, oAuthParameters) = validator("protectedResource", "GET") + val headers = ("Content-type" -> "application/x-www-form-urlencoded") :: Nil + val user = getUser(httpCode,oAuthParameters.get("oauth_token")) - def linkJson(bank: Bank) = { - ("rel" -> "bank") ~ - ("href" -> {"/" + bank.permalink + "/bank"}) ~ + case class ModeratedAccountAndViews(account: ModeratedBankAccount, views: Set[View]) + + val moderatedAccountAndViews = for { + bank <- Bank(bankAlias) ?~ { "bank " + bankAlias + " not found"} ~> 404 + account <- BankAccount(bankAlias, accountAlias) ?~ { "account " + accountAlias + " not found for bank"} ~> 404 + view <- View.fromUrl(viewName) ?~ { "view " + viewName + " not found for account"} ~> 404 + moderatedAccount <- account.moderatedBankAccount(view, user) ?~ {"view/account not authorised"} ~> 401 + availableViews <- Full(account.permittedViews(user)) + } yield ModeratedAccountAndViews(moderatedAccount, availableViews) + + def linkJson(view: View): JObject = { + ("rel" -> view.name) ~ + ("href" -> { "/" + bankAlias + "/accounts/" + accountAlias + "/transactions/" + view.permalink }) ~ ("method" -> "GET") ~ - ("title" -> {"Get information about the bank identified by " + bank.permalink}) + ("title" -> view.description) } - def banksJson: List[JObject] = { - banks.map(bank => { - ("alias" -> bank.permalink) ~ - ("name" -> bank.name) ~ - ("logo" -> "") ~ - ("links" -> linkJson(bank)) - }) + def bankAccountMetaData(mv : ModeratedAccountAndViews) = { + ("views_available" -> mv.views.map(_.toJson)) ~ + ("links" -> mv.views.map(linkJson)) } - JsonResponse("banks" -> banksJson) + + moderatedAccountAndViews.map(mv => JsonResponse("account" -> mv.account.toJson ~ bankAccountMetaData(mv))) + } + + case bankAlias :: "offices" :: Nil JsonGet json => { + //TODO: An office model needs to be created + val offices : List[JObject] = Nil + JsonResponse("offices" -> offices) + } + + case bankAlias :: "bank" :: Nil JsonGet json => { + + def links = { + def accounts = { + ("rel" -> "accounts") ~ + ("href" -> {"/" + bankAlias + "/accounts"}) ~ + ("method" -> "GET") ~ + ("title" -> "Get list of accounts available") + } + + def offices = { + ("rel" -> "offices") ~ + ("href" -> {"/" + bankAlias + "/offices"}) ~ + ("method" -> "GET") ~ + ("title" -> "Get list of offices") + } + + List(accounts, offices) + } + + val bank = for { + bank <- Bank(bankAlias) ?~ { "bank " + bankAlias + " not found"} ~> 404 + } yield bank + + bank.map(b => JsonResponse(b.detailedJson ~ ("links" -> links))) + } + + case "banks" :: Nil JsonGet json => { + JsonResponse("banks" -> Bank.toJson(Bank.all)) } } - ) serve { diff --git a/MavLift/src/main/scala/code/view/.keep b/MavLift/src/main/scala/code/view/.keep deleted file mode 100755 index e69de29bb..000000000 diff --git a/MavLift/src/main/webapp/favicon.ico b/MavLift/src/main/webapp/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..f8fb81e31d0a0f83b896724f212871be03b99e8a GIT binary patch literal 1786 zcmV=w7dd{6eX<{brX?n@@hp_ zT{RNwCJUOB1yvO#O&6`2mXHE=DnfzO5aM8-4gq3p12*Hw%=j_Gd^6wk-Y$Senx;kS zf-X3lv$;Cwch5cdf9_SJlsrmPA8Gc-0FMFw9{`kxUD$W6x3sKcPL-yqabI|?s;aC< zQK|rtaxf6$BydUw;;T$LJvcAEc>I3`80hPdS5(Z|95KUd&{>FNcEQg_Lz-!7s-^%B zL`0GI1jPwNkkwUv1R?uuyU;l@I(oEb;exLocB24{B}O;;h2WqJq*L(naxgO>&klFW z53c=AUQTvPU-_LOePW=|7!(0Iyx%Xum0Yfk?G+d zCal|B9Q&NxQ#Z&u87%iMPse}EirFow%DvVJf&ka`P=IhG41kc5KlJy|G1yCWaS8F* zEY_7*Q&Swn$>siX{Pd~a+qP{>d;_5COxN0mW#4^&JQyiIcJnX;6W5Uv!g_>)XVF@{ zi46;O0FW9>bNa-mj3$zJz6U_0D8iN$lwRa$tg z`|`!M=9ZR!0O$bi?HzUXOB+7ClIe~e==nWD2&RRmp(rYj<6x*Jjg@Nw7)gxs+kNkl z9vdebosN(Jz8~Ne99FGuVlI_ z_dkCRJQZL1czE~EN5OI|O3g9=GE*5YU%Wy?<8rp{+=38-^4Vq7ESgWDkVkkPV^)q2 zdVA2Ng75=WML_`s0!0cGU$Fm+&v;|``qtw|+S~N75!ydAdDBd!2PqCku><>SU1~cH zhGIeh*=&}~@o9@2-v z4e(uof8S@V48H3T3WX@0732Kb^CXignpQW_yt;|x=om*1cHjkq>6$^?yd_w!L*8+* zT^Gl_=WW*|oy$^Un0!Ysa)$2Qd09K$ap=qEpWC%IUiC!H*@07-S_D%IqbVA?qN7NK zVlzrzDNf!U<96yMxk3(As!UiD7^*>S zc|GCjA>y@*u&g{H2+%YQRaJ>h3sblJNfyQz5Ycpc(j%Np4Pyr$j_*-7vx1*2X`;;X z$NqHW(6f8??CJi76z_cY2XkK8_3E3|)zv>5wuU&{f10azdYH_Qle6#g!kX7uwQwC$ z^D#`5e9pqQ9Z;Ys62T0cIQasW>+<@AlQ@A-b43-c71dN55pLZc{PVu|-rarZz=7d^ zI}0AzuYdK{hPvANm&(e^wtG0CN=o;H24ZWNt7)=sRz}-TQ4h9{NF2Utd3C z%jPX}E6U0j7aY4)Q;M1& literal 0 HcmV?d00001 diff --git a/MavLift/src/main/webapp/index.html b/MavLift/src/main/webapp/index.html index 46983df9a..076567faa 100755 --- a/MavLift/src/main/webapp/index.html +++ b/MavLift/src/main/webapp/index.html @@ -1,37 +1,34 @@
-
-
-

- OBP API -

-
-
+ Hello !
diff --git a/MavLift/src/main/webapp/media/css/website.css b/MavLift/src/main/webapp/media/css/website.css index 9248204f1..5d4b99007 100644 --- a/MavLift/src/main/webapp/media/css/website.css +++ b/MavLift/src/main/webapp/media/css/website.css @@ -80,7 +80,7 @@ input.submit { background: transparent url(../images/header.png) repeat-x 50% 100%; } -#accountName { +#accountShortDiscription { font-size: 20px; display: inline-block; } @@ -96,11 +96,12 @@ input.submit { } #about_text { - text-align: left; - width: 600px; - margin-left: auto; - margin-right: auto; + text-align: justify; + width: 500px; margin-top: 15px; + float: left; + margin-left: 20px; + margin-right: 20px; } #nav ul { @@ -495,25 +496,15 @@ span.edit_error_class { float : right; } -#public_accounts { +#public_accounts, #authorised_accounts { background: #FAFAFA; - width: 230px; + width: 200px; border-radius: 8px 8px 8px 8px; padding: 10px 10px 20px 10px; margin-top: 20px; - margin-right: 80px; float: left; } -#authorised_accounts { - background: #FAFAFA; - width: 230px; - border-radius: 8px 8px 8px 8px; - padding: 10px 10px 20px 10px; - margin-top: 20px; - float: right; -} - #homeContent { overflow: hidden; } @@ -566,4 +557,34 @@ a#feedBack height: 87px; background: url(../images/feedback-button.gif); cursor: pointer; +} +span#registrationDetails +{ + font-size: 10px; +} +span.error +{ + color:red; +} +img.moreInfoIcon +{ + margin-left: 5px; +} +span#submissionMessage +{ + display: block; +} +span#submissionSuccess, span#submissionFailed +{ + display: block; + padding: 15px 20px; + background: #66ee55; +} +span#submissionFailed +{ + background: #ff3311; +} +span#accountsMsg +{ + font-size: 13px; } \ No newline at end of file diff --git a/MavLift/src/main/webapp/media/images/favicon.ico b/MavLift/src/main/webapp/media/images/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..f8fb81e31d0a0f83b896724f212871be03b99e8a GIT binary patch literal 1786 zcmV=w7dd{6eX<{brX?n@@hp_ zT{RNwCJUOB1yvO#O&6`2mXHE=DnfzO5aM8-4gq3p12*Hw%=j_Gd^6wk-Y$Senx;kS zf-X3lv$;Cwch5cdf9_SJlsrmPA8Gc-0FMFw9{`kxUD$W6x3sKcPL-yqabI|?s;aC< zQK|rtaxf6$BydUw;;T$LJvcAEc>I3`80hPdS5(Z|95KUd&{>FNcEQg_Lz-!7s-^%B zL`0GI1jPwNkkwUv1R?uuyU;l@I(oEb;exLocB24{B}O;;h2WqJq*L(naxgO>&klFW z53c=AUQTvPU-_LOePW=|7!(0Iyx%Xum0Yfk?G+d zCal|B9Q&NxQ#Z&u87%iMPse}EirFow%DvVJf&ka`P=IhG41kc5KlJy|G1yCWaS8F* zEY_7*Q&Swn$>siX{Pd~a+qP{>d;_5COxN0mW#4^&JQyiIcJnX;6W5Uv!g_>)XVF@{ zi46;O0FW9>bNa-mj3$zJz6U_0D8iN$lwRa$tg z`|`!M=9ZR!0O$bi?HzUXOB+7ClIe~e==nWD2&RRmp(rYj<6x*Jjg@Nw7)gxs+kNkl z9vdebosN(Jz8~Ne99FGuVlI_ z_dkCRJQZL1czE~EN5OI|O3g9=GE*5YU%Wy?<8rp{+=38-^4Vq7ESgWDkVkkPV^)q2 zdVA2Ng75=WML_`s0!0cGU$Fm+&v;|``qtw|+S~N75!ydAdDBd!2PqCku><>SU1~cH zhGIeh*=&}~@o9@2-v z4e(uof8S@V48H3T3WX@0732Kb^CXignpQW_yt;|x=om*1cHjkq>6$^?yd_w!L*8+* zT^Gl_=WW*|oy$^Un0!Ysa)$2Qd09K$ap=qEpWC%IUiC!H*@07-S_D%IqbVA?qN7NK zVlzrzDNf!U<96yMxk3(As!UiD7^*>S zc|GCjA>y@*u&g{H2+%YQRaJ>h3sblJNfyQz5Ycpc(j%Np4Pyr$j_*-7vx1*2X`;;X z$NqHW(6f8??CJi76z_cY2XkK8_3E3|)zv>5wuU&{f10azdYH_Qle6#g!kX7uwQwC$ z^D#`5e9pqQ9Z;Ys62T0cIQasW>+<@AlQ@A-b43-c71dN55pLZc{PVu|-rarZz=7d^ zI}0AzuYdK{hPvANm&(e^wtG0CN=o;H24ZWNt7)=sRz}-TQ4h9{NF2Utd3C z%jPX}E6U0j7aY4)Q;M1& literal 0 HcmV?d00001 diff --git a/MavLift/src/main/webapp/media/images/moreInfo.png b/MavLift/src/main/webapp/media/images/moreInfo.png new file mode 100644 index 0000000000000000000000000000000000000000..ac59994ddfa84df86d399d75a37d9c53b5ad6e70 GIT binary patch literal 925 zcmV;O17iG%P)H};&dp4(t>49&pAMu2=yuO$ z8Q_OsPw$)D<9nkwR_ADZ$jQoO!^txTf5r0`9cyA#q@DsgI?dl$P&yW+kW zc+YLbyxPsF+mrR!etY@(rPfz|-|mH_`PP~R04j~-rL1kPJpIUb^M9Wqy6wBDL3H4g zLr93Nd$W0QEvO7Uy6df|e@KTuI!XaiR$TG=(&p6XL9i_d0vg%&SjB;wL#F)0Qy?N? z7yuin;zK$P#vwvcUG@(+Yl#JD1 z8y`NA7DnvL{HTt&i z9F2nGS8ja}r^Hqif(C$%SR7(f*i9Ce@9wkA%?D3SG+yn-|12z>zS*9)R*6_Z0RSEP zNQ8t!2mnY(%JsJoJ<-b+f4ur8k?OC4VKfXSgD~ov2TFk=A^;>r;GnX@bH_9`CK`M1 zZ>&5Jof#i~vcEq-MAvoj_rFf8$CtEr2mnzC0RfG*0%F+Kyk{Spe5Wi$M4~7H02C4C zgl&hpFvhYm#u&C%#9Fq1ei)3@Y5@R<2qOLu9SmoG- +
+ + + + + + + + + + + + + + + + + + + +
login
email address
password
+ +
+
+ \ No newline at end of file diff --git a/MavLift/src/main/webapp/templates-hidden/default.html b/MavLift/src/main/webapp/templates-hidden/default.html index 9f4730407..6bc84319a 100755 --- a/MavLift/src/main/webapp/templates-hidden/default.html +++ b/MavLift/src/main/webapp/templates-hidden/default.html @@ -1,28 +1,32 @@ @@ -80,7 +84,7 @@ Open Bank Project (http://www.openbankproject.com) Eviscape Profile | Polarize it! | Sources on Github | - + RESTful API

diff --git a/MavLift/src/test/scala/RunWebApp.scala b/MavLift/src/test/scala/RunWebApp.scala index 784fcd7cd..e7c7b8130 100755 --- a/MavLift/src/test/scala/RunWebApp.scala +++ b/MavLift/src/test/scala/RunWebApp.scala @@ -1,21 +1,33 @@ -/** -Open Bank Project +/** +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - - */ +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com +*/ import org.mortbay.jetty.Connector import org.mortbay.jetty.Server import org.mortbay.jetty.webapp.WebAppContext diff --git a/MavLift/src/test/scala/code/AppTest.scala b/MavLift/src/test/scala/code/AppTest.scala index 5d9a19450..a88a15ad2 100755 --- a/MavLift/src/test/scala/code/AppTest.scala +++ b/MavLift/src/test/scala/code/AppTest.scala @@ -1,20 +1,32 @@ /** -Open Bank Project +Open Bank Project - Transparency / Social Finance Web Application +Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd -Copyright 2011,2012 TESOBE / Music Pictures Ltd. +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. -http://www.apache.org/licenses/LICENSE-2.0 +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - +Email: contact@tesobe.com +TESOBE / Music Pictures Ltd +Osloerstrasse 16/17 +Berlin 13359, Germany + + This product includes software developed at + TESOBE (http://www.tesobe.com/) + by + Simon Redfern : simon AT tesobe DOT com + Stefan Bethge : stefan AT tesobe DOT com + Everett Sochowski : everett AT tesobe DOT com + Ayoub Benali: ayoub AT tesobe DOT com */ package code diff --git a/MongoRecordExamplesSpec.scala b/MongoRecordExamplesSpec.scala deleted file mode 100644 index 770e13388..000000000 --- a/MongoRecordExamplesSpec.scala +++ /dev/null @@ -1,574 +0,0 @@ -/* - * Copyright 2010-2011 WorldWide Conferencing, LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* -package net.liftweb -package mongodb -package record - -import java.util.{Calendar, Date, UUID} -import java.util.regex.Pattern - -import net.liftweb.common.{Box, Empty, Failure, Full} -import net.liftweb.json.DefaultFormats -import net.liftweb.json.JsonDSL._ -import net.liftweb.json.JsonAST.JObject -import net.liftweb.record.field._ -import net.liftweb.util.TimeHelpers._ - -import org.specs.Specification - -import com.mongodb._ -import org.bson.types.ObjectId - - -package mongotestrecords { - - import field._ - - class TstRecord private () extends MongoRecord[TstRecord] { - - def meta = TstRecord - - def id = _id.value - - object _id extends UUIDField(this) - - //object binaryfield extends BinaryField(this) - object booleanfield extends BooleanField(this) - //object countryfield extends CountryField(this) - object datetimefield extends DateTimeField(this) - //object decimalfield extends DecimalField(this) - object doublefield extends DoubleField(this) - object emailfield extends EmailField(this, 220) - //object enumfield extends EnumField(this) - object intfield extends IntField(this) - object localefield extends LocaleField(this) - object longfield extends LongField(this) - object passwordfield extends MongoPasswordField(this) - //object postalcodefield extends PostalCodeField(this, countryfield) - object stringfield extends StringField(this, 32) - //object textareafield extends TextareaField(this, 200) - object timezonefield extends TimeZoneField(this) - object patternfield extends PatternField(this) - object datefield extends DateField(this) - - // JsonObjectField (requires a definition for defaultValue) - object person extends JsonObjectField[TstRecord, Person](this, Person) { - def defaultValue = Person("", 0, Address("", ""), Nil) - } - } - - object TstRecord extends TstRecord with MongoMetaRecord[TstRecord] - - case class Address(street: String, city: String) - case class Child(name: String, age: Int, birthdate: Option[Date]) - - case class Person(name: String, age: Int, address: Address, children: List[Child]) - extends JsonObject[Person] { - def meta = Person - } - - object Person extends JsonObjectMeta[Person] - - class MainDoc private () extends MongoRecord[MainDoc] with MongoId[MainDoc] { - - def meta = MainDoc - - object name extends StringField(this, 12) - object cnt extends IntField(this) - - object refdoc extends DBRefField[MainDoc, RefDoc](this, RefDoc) - object refstringdoc extends DBRefField[MainDoc, RefStringDoc](this, RefStringDoc) - - object refdocId extends ObjectIdField(this) { - def obj = RefDoc.find(value) - } - - object refuuid extends UUIDField(this) { - def obj = RefUuidDoc.find(value) - } - } - object MainDoc extends MainDoc with MongoMetaRecord[MainDoc] - - class RefDoc private () extends MongoRecord[RefDoc] with MongoId[RefDoc] { - def meta = RefDoc - } - object RefDoc extends RefDoc with MongoMetaRecord[RefDoc] - - // string as id - class RefStringDoc private () extends MongoRecord[RefStringDoc] { - def meta = RefStringDoc - - def id = _id.value - - object _id extends StringField(this, 36) { - override def defaultValue = UUID.randomUUID.toString - } - - def getRef: DBRef = - MongoDB.use(meta.mongoIdentifier) ( db => - new DBRef(db, meta.collectionName, _id.value) - ) - } - object RefStringDoc extends RefStringDoc with MongoMetaRecord[RefStringDoc] - - // uuid as id - class RefUuidDoc extends MongoRecord[RefUuidDoc] { - def meta = RefUuidDoc - - def id = _id.value - - object _id extends UUIDField(this) - - def getRef: DBRef = - MongoDB.use(meta.mongoIdentifier) ( db => - new DBRef(db, meta.collectionName, _id.value) - ) - } - object RefUuidDoc extends RefUuidDoc with MongoMetaRecord[RefUuidDoc] - - //class ListDoc private () extends MongoRecord[ListDoc] with MongoId[ListDoc] { - class ListDoc extends MongoRecord[ListDoc] with MongoId[ListDoc] { - def meta = ListDoc - - import scala.collection.JavaConversions._ - - // standard list types - object name extends StringField(this, 10) - object stringlist extends MongoListField[ListDoc, String](this) - object intlist extends MongoListField[ListDoc, Int](this) - object doublelist extends MongoListField[ListDoc, Double](this) - object boollist extends MongoListField[ListDoc, Boolean](this) - object objidlist extends MongoListField[ListDoc, ObjectId](this) - object dtlist extends MongoListField[ListDoc, Date](this) - object patternlist extends MongoListField[ListDoc, Pattern](this) - - // specialized list types - object jsonobjlist extends MongoJsonObjectListField(this, JsonDoc) - - // these require custom setFromDBObject methods - object maplist extends MongoListField[ListDoc, Map[String, String]](this) { - override def asDBObject: DBObject = { - val dbl = new BasicDBList - - value.foreach { - m => { - val dbo = new BasicDBObject - - m.keys.foreach(k => { - dbo.put(k.toString, m.getOrElse(k, "")) - }) - - dbl.add(dbo) - } - } - - dbl - } - - override def setFromDBObject(dbo: DBObject): Box[List[Map[String, String]]] = { - val lst: List[Map[String, String]] = - dbo.keySet.toList.map(k => { - dbo.get(k.toString) match { - case bdbo: BasicDBObject if (bdbo.containsField("name") && bdbo.containsField("type")) => - Map("name"-> bdbo.getString("name"), "type" -> bdbo.getString("type")) - case _ => null - } - }).filter(_ != null) - Full(set(lst)) - } - } - - } - object ListDoc extends ListDoc with MongoMetaRecord[ListDoc] - - case class JsonDoc(id: String, name: String) extends JsonObject[JsonDoc] { - def meta = JsonDoc - } - object JsonDoc extends JsonObjectMeta[JsonDoc] - - //class MapDoc private () extends MongoRecord[MapDoc] with MongoId[MapDoc] { - class MapDoc extends MongoRecord[MapDoc] with MongoId[MapDoc] { - def meta = MapDoc - - object stringmap extends MongoMapField[MapDoc, String](this) - } - object MapDoc extends MapDoc with MongoMetaRecord[MapDoc] { - override def formats = DefaultFormats.lossless // adds .000 - } - - class OptionalDoc private () extends MongoRecord[OptionalDoc] with MongoId[OptionalDoc] { - def meta = OptionalDoc - // optional fields - object stringbox extends StringField(this, 32) { - override def optional_? = true - override def defaultValue = "nothin" - } - } - object OptionalDoc extends OptionalDoc with MongoMetaRecord[OptionalDoc] - - class StrictDoc private () extends MongoRecord[StrictDoc] with MongoId[StrictDoc] { - def meta = StrictDoc - object name extends StringField(this, 32) - } - object StrictDoc extends StrictDoc with MongoMetaRecord[StrictDoc] { - - import net.liftweb.json.JsonDSL._ - - ensureIndex(("name" -> 1), true) // unique name - } -} - - -/** - * Systems under specification for MongoRecordExamples. - */ -object MongoRecordExamplesSpec extends Specification("MongoRecordExamples Specification") with MongoTestKit { - import mongotestrecords._ - import net.liftweb.util.TimeHelpers._ - - "TstRecord example" in { - - checkMongoIsRunning - - val pwd = "test" - val cal = Calendar.getInstance - cal.set(2009, 10, 2) - - val tr = TstRecord.createRecord - tr.stringfield("test record string field") - tr.emailfield("test") - tr.validate.size must_== 2 - tr.passwordfield.setPassword(pwd) - tr.emailfield("test@example.com") - tr.datetimefield(cal) - tr.patternfield(Pattern.compile("^Mo", Pattern.CASE_INSENSITIVE)) - tr.validate.size must_== 0 - - // JsonObjectField - val dob1 = Calendar.getInstance.setYear(2005).setMonth(7).setDay(4) - val per = Person("joe", 27, Address("Bulevard", "Helsinki"), List(Child("Mary", 5, Some(dob1.getTime)), Child("Mazy", 3, None))) - tr.person(per) - - // save the record in the db - tr.save - - // retrieve from db - def fromDb = TstRecord.find("_id", tr.id) - - fromDb.isDefined must_== true - - for (t <- fromDb) { - t._id.value must_== tr._id.value - t.booleanfield.value must_== tr.booleanfield.value - TstRecord.formats.dateFormat.format(t.datetimefield.value.getTime) must_== - TstRecord.formats.dateFormat.format(tr.datetimefield.value.getTime) - t.doublefield.value must_== tr.doublefield.value - t.intfield.value must_== tr.intfield.value - t.localefield.value must_== tr.localefield.value - t.longfield.value must_== tr.longfield.value - t.passwordfield.isMatch(pwd) must_== true - t.stringfield.value must_== tr.stringfield.value - t.timezonefield.value must_== tr.timezonefield.value - t.datetimefield.value must_== tr.datetimefield.value - t.patternfield.value.pattern must_== tr.patternfield.value.pattern - t.patternfield.value.flags must_== tr.patternfield.value.flags - t.datefield.value must_== tr.datefield.value - t.person.value.name must_== tr.person.value.name - t.person.value.age must_== tr.person.value.age - t.person.value.address.street must_== tr.person.value.address.street - t.person.value.address.city must_== tr.person.value.address.city - t.person.value.children.size must_== tr.person.value.children.size - for (i <- List.range(0, t.person.value.children.size-1)) { - t.person.value.children(i).name must_== tr.person.value.children(i).name - t.person.value.children(i).age must_== tr.person.value.children(i).age - t.person.value.children(i).birthdate must_== tr.person.value.children(i).birthdate - } - } - - if (!debug) TstRecord.drop - } - - "Ref example" in { - - checkMongoIsRunning - - val ref1 = RefDoc.createRecord - val ref2 = RefDoc.createRecord - - ref1.save must_== ref1 - ref2.save must_== ref2 - - val refString1 = RefStringDoc.createRecord - val refString2 = RefStringDoc.createRecord - - refString1.save must_== refString1 - refString2.save must_== refString2 - - val refUuid1 = RefUuidDoc.createRecord - val refUuid2 = RefUuidDoc.createRecord - - refUuid1.save must_== refUuid1 - refUuid2.save must_== refUuid2 - - val md1 = MainDoc.createRecord - val md2 = MainDoc.createRecord - val md3 = MainDoc.createRecord - val md4 = MainDoc.createRecord - - md1.name.set("md1") - md2.name.set("md2") - md3.name.set("md3") - md4.name.set("md4") - - md1.refdoc.set(ref1.getRef) - md2.refdoc.set(ref1.getRef) - md3.refdoc.set(ref2.getRef) - md4.refdoc.set(ref2.getRef) - - md1.refstringdoc.set(refString1.getRef) - md2.refstringdoc.set(refString1.getRef) - md3.refstringdoc.set(refString2.getRef) - md4.refstringdoc.set(refString2.getRef) - - md1.refdocId.set(ref1.id) - md2.refdocId.set(ref1.id) - md3.refdocId.set(ref2.id) - md4.refdocId.set(ref2.id) - - md1.refuuid.set(refUuid1.id) - md2.refuuid.set(refUuid1.id) - md3.refuuid.set(refUuid2.id) - md4.refuuid.set(refUuid2.id) - - md1.save must_== md1 - md2.save must_== md2 - md3.save must_== md3 - md4.save must_== md4 - - MainDoc.count must_== 4 - RefDoc.count must_== 2 - RefStringDoc.count must_== 2 - - // get the docs back from the db - MainDoc.find(md1.id).foreach(m => { - m.name.value must_== md1.name.value - m.cnt.value must_== md1.cnt.value - m.refdoc.value.getId must_== ref1.getRef.getId - m.refdoc.value.getRef must_== ref1.getRef.getRef - m.refstringdoc.value.getId must_== refString1.getRef.getId - m.refstringdoc.value.getRef must_== refString1.getRef.getRef - m.refdocId.value must_== md1.refdocId.value - m.refuuid.value must_== md1.refuuid.value - }) - - // fetch a refdoc - val refFromFetch = md1.refdoc.obj - refFromFetch.isDefined must_== true - refFromFetch.open_!.id must_== ref1.id - - // query for a single doc with a JObject query - val md1a = MainDoc.find(("name") -> "md1") - md1a.isDefined must_== true - md1a.foreach(o => o.id must_== md1.id) - - // query for a single doc with a k, v query - val md1b = MainDoc.find("_id", md1.id) - md1b.isDefined must_== true - md1b.foreach(o => o.id must_== md1.id) - - // query for a single doc with a Map query - val md1c = MainDoc.find(("name" -> "md1")) - md1c.isDefined must_== true - md1c.foreach(o => o.id must_== md1.id) - - // find all documents - MainDoc.findAll.size must_== 4 - RefDoc.findAll.size must_== 2 - - // find all documents with JObject query - val mdq1 = MainDoc.findAll(("name" -> "md1")) - mdq1.size must_== 1 - - // find all documents with $in query, sorted - val qry = ("name" -> ("$in" -> List("md1", "md2"))) - val mdq2 = MainDoc.findAll(qry, ("name" -> -1)) - mdq2.size must_== 2 - mdq2.head.id must_== md2.id - - // Find all documents using a k, v query - val mdq3 = MainDoc.findAll("_id", md1.id) - mdq3.size must_== 1 - - // find all documents with field selection - val mdq4 = MainDoc.findAll(("name" -> "md1"), ("name" -> 1), Empty) - mdq4.size must_== 1 - - // Upsert - this should add a new row - val md5 = MainDoc.createRecord - md5.name.set("md5") - md5.refdoc.set(ref1.getRef) - md5.refstringdoc.set(refString1.getRef) - MainDoc.update(("name" -> "nothing"), md5, Upsert) - MainDoc.findAll.size must_== 5 - - // modifier operations $inc, $set, $push... - val o2 = (("$inc" -> ("cnt" -> 1)) ~ ("$set" -> ("name" -> "md1a"))) - MainDoc.update(("name" -> "md1"), o2) - // get the doc back from the db and compare - val mdq5 = MainDoc.find("_id", md1.id) - mdq5.isDefined must_== true - mdq5.map ( m => { - m.name.value must_== "md1a" - m.cnt.value must_== 1 - }) - - if (!debug) { - // delete them - md1.delete_! - md2.delete_! - md3.delete_! - md4.delete_! - md5.delete_! - ref1.delete_! - ref2.delete_! - - MainDoc.findAll.size must_== 0 - - MainDoc.drop - RefDoc.drop - RefStringDoc.drop - } - } - - "List example" in { - checkMongoIsRunning - - val ref1 = RefDoc.createRecord - val ref2 = RefDoc.createRecord - - ref1.save must_== ref1 - ref2.save must_== ref2 - - val name = "ld1" - val strlist = List("string1", "string2", "string3", "string1") - val jd1 = JsonDoc("1", "jsondoc1") - - val ld1 = ListDoc.createRecord - ld1.name.set(name) - ld1.stringlist.set(strlist) - ld1.intlist.set(List(99988,88, 88)) - ld1.doublelist.set(List(997655.998,88.8)) - ld1.boollist.set(List(true,true,false)) - ld1.objidlist.set(List(ObjectId.get, ObjectId.get)) - ld1.dtlist.set(List(now, now)) - ld1.jsonobjlist.set(List(jd1, JsonDoc("2", "jsondoc2"), jd1)) - ld1.patternlist.set(List(Pattern.compile("^Mongo"), Pattern.compile("^Mongo2"))) - ld1.maplist.set(List(Map("name" -> "map1", "type" -> "map"), Map("name" -> "map2", "type" -> "map"))) - - ld1.save must_== ld1 - - val qld1 = ListDoc.find(ld1.id) - - qld1.isDefined must_== true - - qld1.foreach { l => - l.name.value must_== ld1.name.value - l.stringlist.value must_== ld1.stringlist.value - l.intlist.value must_== ld1.intlist.value - l.doublelist.value must_== ld1.doublelist.value - l.boollist.value must_== ld1.boollist.value - l.objidlist.value must_== ld1.objidlist.value - l.dtlist.value must_== ld1.dtlist.value - l.jsonobjlist.value must_== ld1.jsonobjlist.value - for (i <- List.range(0, l.patternlist.value.size-1)) { - l.patternlist.value(i).pattern must_== ld1.patternlist.value(i).pattern - } - l.maplist.value must_== ld1.maplist.value - for (i <- List.range(0, l.jsonobjlist.value.size-1)) { - l.jsonobjlist.value(i).id must_== ld1.jsonobjlist.value(i).id - l.jsonobjlist.value(i).name must_== ld1.jsonobjlist.value(i).name - } - } - - if (!debug) { - ListDoc.drop - RefDoc.drop - } - } - - "Map Example" in { - - checkMongoIsRunning - - val md1 = MapDoc.createRecord - md1.stringmap.set(Map("h" -> "hola")) - - md1.save must_== md1 - - md1.delete_! - - if (!debug) MapDoc.drop - } - - "Optional Example" in { - - checkMongoIsRunning - - val od1 = OptionalDoc.createRecord - od1.stringbox.valueBox must_== Empty - od1.save must_== od1 - - OptionalDoc.find(od1.id).foreach { - od1FromDB => - od1FromDB.stringbox.valueBox must_== od1.stringbox.valueBox - } - - - val od2 = OptionalDoc.createRecord - od1.stringbox.valueBox must_== Empty - od2.stringbox.set("aloha") - od2.save must_== od2 - - OptionalDoc.find(od2.id).foreach { - od2FromDB => - od2FromDB.stringbox.valueBox must_== od2.stringbox.valueBox - } - - if (!debug) OptionalDoc.drop - } - - "Strict Example" in { - - checkMongoIsRunning - - val sd1 = StrictDoc.createRecord.name("sd1") - val sd2 = StrictDoc.createRecord.name("sd1") - - sd1.save(true) must_== sd1 - sd2.save(true) must throwA[MongoException] - - sd1.save - - sd2.name("sd2") - sd2.save(true) must_== sd2 - - if (!debug) StrictDoc.drop - } -} - -*/ \ No newline at end of file diff --git a/README b/README index 058defbf8..73c7282fa 100644 --- a/README +++ b/README @@ -1,8 +1,31 @@ -This project contains some try outs so far. +README -The project is using sbt or Maven 2 as a build tool. See build.scala or pom.xml respectively for the dependencies. +Welcome to the Open Bank Project Social Finance / Transparency Web Application! -I used IntelliJ IDEA as my IDE. It has nice autocompletion. +ABOUT + +This appliation demostrates some of the principles of the Open Bank Project: + +1) Sliding scale of privacy and disclosure. e.g. Use aliases to protect real names but still show the flow of money . +2) Different views on account data (Public / Share holders / Team etc.) e.g. hide balances on public view. +3) Comment on transactions +4) Add other meta data e.g. tags / images to transactions / payees. + + +STATUS + +Currently this repository also contains API code - but that is in the process of moving to https://github.com/OpenBankProject/OBP-API + + +LICENSE + +This project is dual licensed under the AGPL V3 (see NOTICE) and a commercial license from TESOBE +Some files (OAuth related) are licensed under the Apache 2 license. + +SETUP + +The project is using sbt or Maven 2 as a build tool. +See build.scala or pom.xml respectively for the dependencies. ---- @@ -37,45 +60,7 @@ Note: You may need to add the pluginGroup to the $HOME/.m2/settings.xml ... ----- +--- +You need to install MongoDB and create an empty database called "OBP006". - -To test one of the URL's use: -curl http://localhost:8080/mongodb - -Other important files: - Boot.scala - SomeThing.scala - This file contains the URL routes (like urls.py) and my try outs- See serve case Req - - ----- - - -I tried several approaches for scala talking to mongodb - -Lift Record: works for inserts and simple (inc geo) queries. but i couldn't figure out how to sort. -Rogue: I got this to import but couldn't get the "where" syntax to compile. -Casbah: works including sorting. :-) - -Casbah is the officialy supported Scala driver for MongoDB. It is a thin wrapper for the Java driver which is very well used -so I guess its a good choice at least until we understand how to use Lift Record/ Rogue better. -We can still use Lift Record for inserts etc. - -It also has a full time developer working on it. The documentation tends to lack examples, but this helps: -https://github.com/mongodb/casbah/blob/master/casbah-query/src/test/scala/DSLCoreOperatorsSpec.scala#L861-984 - -You'll also need to add the import statement to get the query syntax: -import com.mongodb.casbah.query.Imports._ - -To start mongodb -sudo mongod - - -Note: you might want to look at the mongo data from the mongo command line: - db.chooseitems.find( { location : { $near : [2,2] } } ) - - etc. - - - s.r. diff --git a/scala_snippets.txt b/scala_snippets.txt deleted file mode 100644 index 5a10f2712..000000000 --- a/scala_snippets.txt +++ /dev/null @@ -1,545 +0,0 @@ -package com.tesobe.something{ - // I am in another package - object SimonSays { - println("here we are in SimonSays") - def do_something() : String = { - println("here we are in do_something") - "ok" - } - } -} - - -package com.tesobe.utils { - -import net.liftweb.http._ -import net.liftweb.http.rest._ -import net.liftweb.json.JsonDSL._ -import net.liftweb.json.Printer._ -import net.liftweb.json.Extraction._ -import net.liftweb.json.JsonAST._ // this has render in it. - -import net.liftweb.json._ // Yep everything -import net.liftweb.common.Full -import net.liftweb.mongodb._ -import net.liftweb.json.JsonAST.JString - -// import com.mongodb.casbah.commons._ -import com.mongodb.casbah.Imports._ - -//import com.rabbitmq.client._ -//import net.liftweb.amqp._ - - -/* -import com.rabbitmq.client.Address -import akka.amqp.AMQP.{ProducerParameters, ExchangeParameters} -import akka.amqp.{Topic, Message, AMQP} -*/ - -// used to construct type -import com.tesobe.something._ - - - -import net.liftweb.mongodb._ - -import _root_.java.math.MathContext -import net.liftweb.mongodb.record._ -import net.liftweb.mongodb.record.field._ -import net.liftweb.record.field._ -import net.liftweb.record._ -import org.bson.types._ -import org.joda.time.{DateTime, DateTimeZone} - -//import com.foursquare.rogue -import com.foursquare.rogue.Rogue._ - - -import java.util.regex.Pattern - - -//import org.junit._ -//import org.specs.SpecsMatchers - -import com.foursquare.rogue.MongoHelpers._ - -//////////// - -import _root_.net.liftweb.common._ -import _root_.net.liftweb.util._ -import _root_.net.liftweb.http._ -import _root_.net.liftweb.mapper._ -import _root_.net.liftweb.util.Helpers._ -import _root_.net.liftweb.sitemap._ -import _root_.scala.xml._ -import _root_.net.liftweb.http.S._ -import _root_.net.liftweb.http.RequestVar -import _root_.net.liftweb.util.Helpers._ -import _root_.net.liftweb.common.Full -import net.liftweb.mongodb.{Skip, Limit} -import _root_.net.liftweb.http.S._ -import _root_.net.liftweb.mapper.view._ -import com.mongodb._ - -import code.model._ -//import code.model.Location - -// Note: on mongo console db.chooseitems.ensureIndex( { location : "2d" } ) - -// Call like http://localhost:8080/api/balance/theaccountnumber/call.json -// See http://www.assembla.com/spaces/liftweb/wiki/REST_Web_Services - - -object OBPRest extends RestHelper { - println("here we are in OBPRest") - serve { - case Req("html" :: "accounts" :: account_name, _, GetRequest) => Hello Accounts - case Req("api" :: "static" :: _, "json", GetRequest) => JString("Static") - case Req("api" :: "static" :: _, "xml", GetRequest) => Static Hello - case Req("api" :: "transactions" :: account_number, "", GetRequest) => - /* var first_account_number = account_number.head - var json_message_2 = parse(""" { "numbers" : [1, 2, 3, 4] } """) */ - - var transactions = OBPTransaction.findAll(QueryBuilder.start().get()) - - /*val qry = QueryBuilder.start("description").is("simons another item") - .put("location") - .withinCenter(longitude, latitude, range_radians) - .get*/ - - //var some_json = """{"name":"joe","age":15}""" - //var json_string = parse(some_json) - - JsonResponse(transactions.map(t => { t.asJValue })) - - case Req("ping" :: Nil, _, _) => () => Full(PlainTextResponse("pong")) - - case Req("xml":: Nil, _, _) => Full(XmlResponse( - - Simon - John - - )) - - case Req("json":: Nil, _, _) => () => Full(JsonResponse(List("simon","says"))) - - case Req("mongodb":: Nil, _, _) => () => - - // Create a location object - val location = Location.createRecord.longitude(2).latitude(51) - - // Create a transaction object and save it in the mongodb - /* - Works! - - - val choose_item_1 = OBPTransaction.createRecord - .obp_transaction_amount(-100) - .obp_transaction_currency("EU") - .obp_transaction_location(location) - .opb_transaction_other_account("Print Supplier") - .save - - */ - - - //val choose_items = ChooseItem.findAll - - // don't seem to need parse. This is a query using the DSL (domain specific language) - var simple_query = ("description" -> "simons another item") ~ ("price" -> 123.45) - // JObject(List(JField(description,JString(simons another item)), JField(price,JDouble(123.45)))) - - - - println(simple_query) - - // couldn't get this to work println(Printer.pretty(simple_query)) - - var string_query = """{ "description" : "simons another item" , "price" : 123.45 } """ - - - var location_query_string = """{ "location" : { "$near" : [2,2] } }""" - - var location_query_json = parse(location_query_string)// ("location" -> ("$near" -> (2,2))) - - - println(location_query_json) - - - - - // See http://api.mongodb.org/java/2.3/com/mongodb/QueryBuilder.html - - import com.mongodb._ - - var longitude = 2 // x - var latitude = 51 // y - - var earth_radius_km = 6378.137 // km - var range_km = 5 // km - var range_radians = range_km / earth_radius_km - - - // .sort("description").is(-1) - - - // To get records using mongodb record - val qry = QueryBuilder.start("description").is("simons another item") - .put("location") - .withinCenter(longitude, latitude, range_radians) - .get - - val choose_items = OBPTransaction.findAll(qry) - - // Note: we should be able to sort and limit the results. but don't know the syntax. - //val choose_items = ChooseItem.findAll(qry).sortBy("don't know what to put here") - ///////////////////////////////// - // Hmm Can't get this to work. - import com.foursquare.rogue.Rogue._ - //val cs: List[ChooseItem] = (ChooseItem where (_.description eqs "simons another item")) - //ChooseItem where (_.description eqs "simons another item") - ///////////////////////////////////////////////////////////// - - - - - - - - var some_json = """{"name":"joe","age":15}""" - - var json_string = parse(some_json) - - - - - println("here you are:") - - /////////////////////////////////////////////// - // Using Casbah..................... - - // Get a connection to MongoDB (note. Lift uses model/MongoConfig.scala for this config) - val mongoConn = MongoConnection("obp_mongodb", 27017) - - - // Get a mongodb database - val mongoDB = mongoConn("OBP003") - - - // Get a collection - val obp_transactions_collection = mongoDB.getCollection("obptransactions") - - // Print count of items in the collection - println ("casbah thinks there are %d records in choose_items ".format(obp_transactions_collection.count())) - - - // A Geo query! - val my_query: DBObject = MongoDBObject("location" -> MongoDBObject( - "$within" -> MongoDBObject( - "$centerSphere" -> MongoDBList( - MongoDBList(2, 51), - 0.1)))) - - // Define sort - val my_sort: DBObject = MongoDBObject("description" -> -1) - // Limit - val my_limit = 5 - - - // Get the items, applying the sort and limit. - val my_cursor = obp_transactions_collection.find(my_query).sort(my_sort).limit(my_limit) - - - // Print the results. - while(my_cursor.hasNext()) { - println(my_cursor.next()); - } - - println ("casbah thinks there are %d records in my_records ".format(my_cursor.count())) - - /* - - Works! - - // To create a record with Casbah - val newObj1 = MongoDBObject("foo" -> "bar", - "x" -> "y", - "pie" -> 3.14, - "spam" -> "eggs") - - - println("The database names are %s".format(mongoConn.databaseNames)) - println (mongoConn.databaseNames) - - - // To create - val builder = MongoDBObject.newBuilder - builder += "foo" -> "bar" - builder += "x" -> "y" - builder += ("pie" -> 3.14) - builder += ("spam" -> "eggs", "mmm" -> "bacon") - val newObj2 = builder.result - - // and update a record - newObj2 += "OMG" -> "Ponies!" - - */ - - val mongoColl = MongoConnection()("chooseitems") - - - val q = MongoDBObject("user" -> "someOtherUser") - - - val items_count = choose_items.size - - println("There are %d items in the list".format(items_count)) - - if (items_count > 0) { - //println(choose_items.first.description) - println("after--------") - } - - - //Full(XhtmlResponse(choose_item_1.toXHtml)) - //Full(JsonResponse(List("Count of items found", items_count))) - - val json_message = ("items_count" -> items_count) - - // The last result of the function is returned. - Full(JsonResponse(json_message)) - } -} - - - - - - -//import com.rabbitmq.client.{Channel, Connection, ConnectionFactory, QueueingConsumer} - - - - -object RabbitHelper -{ - println("start") - - // see http://akka.io/docs/akka-modules/1.1.2/modules/amqp.html - // ( or http://olim7t.github.com/liftweb-2.0-release-sxr/net/liftweb/amqp/AMQPSender.scala.html ) - // https://github.com/jboner/akka-modules/blob/master/akka-amqp/src/test/scala/akka/amqp/test/AMQPProducerMessageTestIntegration.scala - - println("Before connection") - - - - - /* - - val myAddresses = Array(new Address("myrabbitmq", 5672)) // This can be a list , new Address("someotherhostbla", 5672) - val connectionParameters = AMQP.ConnectionParameters(myAddresses, "test", "test", "test")// host(s), user, pass, vhost - val connection = AMQP.newConnection(connectionParameters) - - - - - val exchangeParameters = ExchangeParameters("my_topic_exchange", Topic) - val producer = AMQP.newProducer(connection, ProducerParameters(Some(exchangeParameters), producerId = Some("my_producer")) - */ - - - - //producer.sendOneWay("Some simple sting data".getBytes, "some.routing.key") - - - //producer ! Message("Some simple sting data".getBytes, "some.routing.key") - - - - - // println("After connection") - - var x = hello("world") - - def hello (input: String): String = { - "hello" - } - - - - - /* - - - - - var channel = getAMQPChannel("feed", "test") - var consumer: QueueingConsumer = null - while (true) { - var task: QueueingConsumer.Delivery = null - try { task = consumer.nextDelivery() } - catch { - case ex: Exception => { - println("XX Error in AMQP connection: reconnecting.", ex) - Thread.sleep(5000) - channel = getAMQPChannel("feed", "test") - } - } - - if (task != null && task.getBody() != null) { - println(new String(task.getBody())) - try { channel.basicAck(task.getEnvelope().getDeliveryTag(), false) } - catch { - case ex: Exception => { println("Error ack'ing message.", ex) } - } - } - } - - - - - // Opens up a connection to RabbitMQ, retrying every five seconds - // if the queue server is unavailable. - def getAMQPChannel(queue: String, vhost: String) : Channel = { - var attempts = 0 - var channel: Channel = null - var connection: Connection = null - - println("Opening connection to AMQP " + vhost + " " + queue + "...") - try { - connection = getConnection(queue, "myrabbitmq", 5672, "guest", "guest",vhost) - // queue - host - port - username - password - vhost - connection = getConnection(queue // queue - , "myrabbitmq" // host - , 5672 // port - , "test" // username - , "test" // password - , vhost // vhost - ) - channel = connection.createChannel() - consumer = new QueueingConsumer(channel) - channel.exchangeDeclare(queue, "direct", true) - channel.queueDeclare(queue, true, false, false, null) - channel.queueBind(queue, queue, queue) - channel.basicConsume(queue, false, consumer) - println("Connected to RabbitMQ") - } catch { - case ex: Exception => { - println(".....cannot connect to AMQP. ")//, ex) - } - } - channel - } - - // Returns a new connection to an AMQP queue. - def getConnection(queue: String, host: String, port: Int, username: String, password: String, vhost: String): Connection = { - val factory = new ConnectionFactory() - factory.setHost(host) - factory.setPort(port) - factory.setUsername(username) - factory.setPassword(password) - factory.setVirtualHost(vhost) - factory.newConnection() - } - - */ - -} - - - - - - - -} // end of package - - - /* -package com.tesobe.rabbit { - - import com.rabbitmq.client.{Channel, Connection, ConnectionFactory, QueueingConsumer} - //import com.rabbitmq.client._ - - //import net.liftweb._ - - -object Sender -{ -? - - - def send_it () : String = { - - - - "OK" - } -} - -*/ - ------------------------------------------- - - - -package code.snippet.BeerSnippet - -/** - * Created by IntelliJ IDEA. - * User: simonredfern - * Date: 10/17/11 - * Time: 1:21 PM - * To change this template use File | Settings | File Templates. - */ - -import net.liftweb.util.Helpers._ -import xml.NodeSeq - -class BeerSnippet { - def count( xhtml: NodeSeq ) = { - val consumption = ("Tuborg Beer",2) :: ("Harboe pilsner",2) :: ("Red wine",1) :: ("Pan Galactic Gargle Blaster",1) :: Nil - def bindConsumption(template: NodeSeq): NodeSeq = { - consumption.flatMap{ case (bev, count) => bind("beverage", template,"name" -> bev,"count" -> count)} - } - bind("person",xhtml, "name" -> "Mads", "consumption" -> bindConsumption _) - } -} - - - - ----------------------------- - - -package code -package snippet - -import net.liftweb.util._ -import net.liftweb.common._ -import java.util.Date -import code.lib._ -import Helpers._ - -class HelloWorld { - lazy val date: Box[Date] = DependencyFactory.inject[Date] // inject the date - - // replace the contents of the element with id "time" with the date - def howdy = "#time *" #> date.map(_.toString) - - /* - lazy val date: Date = DependencyFactory.time.vend // create the date via factory - - def howdy = "#time *" #> date.toString - */ -} - -class MyFirstScalaClass { - - // def yoyoyo = 123 - - - -} --------------------------- \ No newline at end of file