What was this?

So when I was about a quarter of the way into a glass of wine I invited this guy over to my apartment. I was definitely not drunk and still was fully aware of my inhibitions. We had had casual sex twice before after meeting on tinder but had developed a kind of friendship and have been planning a trip to San Diego together for winter break. Before he came over I told him I did not want to have sex and he said "Ok." While I waited for him I finished my first glass of wine, and when he got here I poured a second one and he had his first. Then we had one more drink after that while we were talking. While we were talking he tried feeling me up and I pushed him away saying "I told you.." and he said "I was just trying to feel around" in a joking way. Then when we finished our drinks he started kissing and feeling me up again and this time I didn't push him away and we ended up having sex. I really didn't want to have sex with him tonight and I told him before to make it clear before I was drunk. Was this rape?? I'm really upset about it but I don't think I can do anything about this.

In the past I was raped by someone who, while I was half asleep, asked if they could go inside me and I said no and they did it anyway and I just kind of froze up because I was afraid. I never reported it because I was in high school and didn't know it was rape because it wasn't violent like you see on TV, but that was my virginity and I still feel very violated by it. I don't know if this current situation is sexual assault or not because YET AGAIN I didn't fight him. So I feel like I have poor judgment and want more opinions. Thanks in advance and sorry this is so long.